diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-11-25 18:17:28 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-11-25 18:17:28 +0100 |
| commit | 65ca700def99289cc31a7040537f5aa6e12bf485 (patch) | |
| tree | 97b3a07299b626c519da0e80c122b5b79b933914 /strings/strmov.c | |
| parent | 2ab57de38d13d927ddff2d51aed4af34e13998f5 (diff) | |
| parent | 6e5bcca7935d3c62f84bb640e5357664a210ee12 (diff) | |
| download | mariadb-git-65ca700def99289cc31a7040537f5aa6e12bf485.tar.gz | |
merge.
checkpoint.
does not compile.
Diffstat (limited to 'strings/strmov.c')
| -rw-r--r-- | strings/strmov.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/strings/strmov.c b/strings/strmov.c index 4d4915d27a0..849c5812401 100644 --- a/strings/strmov.c +++ b/strings/strmov.c @@ -24,10 +24,7 @@ #include <my_global.h> #include "m_string.h" -#ifdef strmov -#undef strmov -#define strmov strmov_overlapp -#endif +#ifndef strmov char *strmov(register char *dst, register const char *src) { @@ -35,3 +32,4 @@ char *strmov(register char *dst, register const char *src) return dst-1; } +#endif /* strmov */ |