diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-02-06 17:13:42 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-02-06 17:13:42 +0100 |
| commit | 7257047dcefd2f2250e629b2aa3bcd84f980cf90 (patch) | |
| tree | ccd7ed37b88de38a47462ff2a6c95aec6ad8bc08 /include/m_string.h | |
| parent | 4d0b901a55e1f27cb7e5caedced1ebbb923d366b (diff) | |
| parent | b38ef2b5f7bc231b63b770c28688ee9f0109c88b (diff) | |
| download | mariadb-git-7257047dcefd2f2250e629b2aa3bcd84f980cf90.tar.gz | |
merge
Diffstat (limited to 'include/m_string.h')
| -rw-r--r-- | include/m_string.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/m_string.h b/include/m_string.h index 83622a5523e..a118144d310 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -92,9 +92,7 @@ extern char *stpcpy(char *, const char *); /* For AIX with gcc 2.95.3 */ extern char NEAR _dig_vec_upper[]; extern char NEAR _dig_vec_lower[]; -#ifdef BAD_STRING_COMPILER -#define strmov(A,B) (memccpy(A,B,0,INT_MAX)-1) -#else +#ifndef strmov #define strmov_overlapp(A,B) strmov(A,B) #define strmake_overlapp(A,B,C) strmake(A,B,C) #endif @@ -152,12 +150,11 @@ extern size_t strinstr(const char *str,const char *search); extern size_t r_strinstr(const char *str, size_t from, const char *search); extern char *strkey(char *dst,char *head,char *tail,char *flags); extern char *strmake(char *dst,const char *src,size_t length); -#ifndef strmake_overlapp -extern char *strmake_overlapp(char *dst,const char *src, size_t length); -#endif #ifndef strmov extern char *strmov(char *dst,const char *src); +#else +extern char *strmov_overlapp(char *dst,const char *src); #endif extern char *strnmov(char *dst,const char *src,size_t n); extern char *strsuff(const char *src,const char *suffix); |