diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-06-03 16:45:49 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-06-03 16:45:49 +0300 |
| commit | 5ec76be436655eefc2a6403b21606fad914ac814 (patch) | |
| tree | 922de2537c98e10f74062077d66ad1800d04522c /include/m_string.h | |
| parent | 45c6bb8aa5ffd61dfe352df1921152d1d6b8f95b (diff) | |
| download | mariadb-git-5ec76be436655eefc2a6403b21606fad914ac814.tar.gz | |
Declare stpcpy() to fix portability problem on AIX with gcc 2.95.3
Fixed problem with command line arguments on 64 bit machines when
we use ~0 to indicate 'no limit'
include/m_string.h:
Declare stpcpy() to fix portability problem on AIX with gcc 2.95.3
mysys/getvar.c:
Fixed problem on 64 bit machines when we use ~0 to indicate 'no limit'.
sql-bench/Comments/postgres.benchmark:
U
Diffstat (limited to 'include/m_string.h')
| -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); |