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 /include/m_string.h | |
| parent | dbb7073c21ad5208ff1276fdf7cd358d1e0e09dd (diff) | |
| parent | b640b8f0369716052dcbf14a131ba31e04a464ae (diff) | |
| download | mariadb-git-b90ecd4baedbb4e53e982c72ea2b3f0936f0c289.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 c24bfd7aa6c..a25675f2638 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -95,9 +95,7 @@ extern char NEAR _dig_vec_lower[]; /* Defined in strtod.c */ extern const double log_10[309]; -#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 @@ -155,12 +153,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); |