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 | b90ecd4baedbb4e53e982c72ea2b3f0936f0c289 (patch) | |
tree | c6b1f5db7db13c26c33cd667009b0b06932e2b41 /strings | |
parent | dbb7073c21ad5208ff1276fdf7cd358d1e0e09dd (diff) | |
parent | b640b8f0369716052dcbf14a131ba31e04a464ae (diff) | |
download | mariadb-git-b90ecd4baedbb4e53e982c72ea2b3f0936f0c289.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 */ |