diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-06-05 03:48:25 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-06-05 03:48:25 +0300 |
| commit | d82a86e61b04c0d78a3216d97a346c24bd2dd218 (patch) | |
| tree | c3801de3a55a3908dafdbc48f1bb034307fc85fc /include | |
| parent | fe1842d9ee1a7e51f74ca192d3181968f16a0b29 (diff) | |
| parent | 011b141574d8b4c07b9f6b0f8c2f44b18d751646 (diff) | |
| download | mariadb-git-d82a86e61b04c0d78a3216d97a346c24bd2dd218.tar.gz | |
merge
client/mysqltest.c:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_string.h | 13 | ||||
| -rw-r--r-- | include/violite.h | 3 |
2 files changed, 8 insertions, 8 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); diff --git a/include/violite.h b/include/violite.h index a88b5c0db51..ffef4d68c73 100644 --- a/include/violite.h +++ b/include/violite.h @@ -210,9 +210,6 @@ struct st_VioSSLConnectorFd *new_VioSSLConnectorFd( struct st_VioSSLAcceptorFd *new_VioSSLAcceptorFd( const char* key_file,const char* cert_file,const char* ca_file,const char* ca_path); Vio* new_VioSSL(struct st_VioSSLAcceptorFd* fd, Vio* sd,int state); -//static int -//init_bio_(struct st_VioSSLAcceptorFd* fd, Vio* sd, int state, int bio_flags); -//void report_errors(); #ifdef __cplusplus } |