diff options
author | Georgi Kodinov <joro@sun.com> | 2009-12-24 11:00:04 +0200 |
---|---|---|
committer | Georgi Kodinov <joro@sun.com> | 2009-12-24 11:00:04 +0200 |
commit | c248859ec8794ec19665ecaed393c53ffffbfcaf (patch) | |
tree | c6b1f5db7db13c26c33cd667009b0b06932e2b41 /strings | |
parent | a21a0b47ca46212a528c4402e4b473fe51437422 (diff) | |
parent | adc17cd41e21cb68d63b9962a97ad075da02999f (diff) | |
download | mariadb-git-c248859ec8794ec19665ecaed393c53ffffbfcaf.tar.gz |
merge
Diffstat (limited to 'strings')
-rw-r--r-- | strings/strmov.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/strings/strmov.c b/strings/strmov.c index 1393411dd8f..eedf22a4ef1 100644 --- a/strings/strmov.c +++ b/strings/strmov.c @@ -24,13 +24,11 @@ #include <my_global.h> #include "m_string.h" -#ifdef BAD_STRING_COMPILER +#ifdef strmov #undef strmov #define strmov strmov_overlapp #endif -#ifndef strmov - #if !defined(MC68000) && !defined(DS90) char *strmov(register char *dst, register const char *src) @@ -53,5 +51,3 @@ char *strmov(dst, src) } #endif - -#endif /* strmov */ |