diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-06-04 18:06:27 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-06-04 18:06:27 -0600 |
| commit | 011b141574d8b4c07b9f6b0f8c2f44b18d751646 (patch) | |
| tree | 45b64c0c80f0e3e20d48ff1198e95159e6b3b649 /include | |
| parent | bd58e5e12fd7ceae0cc314ebbe899fa209e9561a (diff) | |
| parent | fdff9c0a4521e4006eb7dd718e19077afe6fbb37 (diff) | |
| download | mariadb-git-011b141574d8b4c07b9f6b0f8c2f44b18d751646.tar.gz | |
Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
BitKeeper/etc/logging_ok:
auto-union
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_string.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/include/m_string.h b/include/m_string.h index ce5197f17af..84c42e0c8b9 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -69,10 +69,6 @@ # define memmove(d, s, n) bmove((d), (s), (n)) /* our bmove */ #endif -#if defined(HAVE_STPCPY) && !defined(HAVE_mit_thread) -#define strmov(A,B) stpcpy((A),(B)) -#endif - /* Unixware 7 */ #if !defined(HAVE_BFILL) # define bfill(A,B,C) memset((A),(C),(B)) @@ -90,6 +86,13 @@ extern "C" { #endif +#if defined(HAVE_STPCPY) && !defined(HAVE_mit_thread) +#define strmov(A,B) stpcpy((A),(B)) +#ifndef stpcpy +extern char *stpcpy(char *, const char *); /* For AIX with gcc 2.95.3 */ +#endif +#endif + extern char NEAR _dig_vec[]; /* Declared in int2str() */ #ifdef BAD_STRING_COMPILER @@ -148,7 +151,7 @@ extern void bchange(char *dst,uint old_len,const char *src, uint new_len,uint tot_len); extern void strappend(char *s,uint len,pchar fill); extern char *strend(const char *s); -extern char *strcend(const char *, pchar); +extern char *strcend(const char *, pchar); extern char *strfield(char *src,int fields,int chars,int blanks, int tabch); extern char *strfill(my_string s,uint len,pchar fill); |