summaryrefslogtreecommitdiff
path: root/ext/mysql/libmysql/m_string.h
diff options
context:
space:
mode:
authorMySQL Team <mysql@php.net>2001-01-23 16:48:50 +0000
committerMySQL Team <mysql@php.net>2001-01-23 16:48:50 +0000
commit800f555b707c696798877c80352ded46289e87c4 (patch)
treec540242b6e6da4e9b99b46797a26b215abef0a64 /ext/mysql/libmysql/m_string.h
parentd36858681a0d48414702524ebd16f31289b06fa8 (diff)
downloadphp-git-800f555b707c696798877c80352ded46289e87c4.tar.gz
Upgrade ext/mysql/libmysql to version 3.23.32. One notable bug fix is
that the client can now connect to a server which is using a default charset other than latin1.
Diffstat (limited to 'ext/mysql/libmysql/m_string.h')
-rw-r--r--ext/mysql/libmysql/m_string.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysql/libmysql/m_string.h b/ext/mysql/libmysql/m_string.h
index bc1fa06046..1bc3144fdb 100644
--- a/ext/mysql/libmysql/m_string.h
+++ b/ext/mysql/libmysql/m_string.h
@@ -48,7 +48,7 @@ This file is public domain and comes with NO WARRANTY of any kind */
#if !defined(HAVE_MEMCPY) && !defined(HAVE_MEMMOVE)
# define memcpy(d, s, n) bcopy ((s), (d), (n))
# define memset(A,C,B) bfill((A),(B),(C))
-# define memmove(d, s, n) bmove ((s), (d), (n))
+# define memmove(d, s, n) bmove ((d), (s), (n))
#elif defined(HAVE_MEMMOVE)
# define bmove(d, s, n) memmove((d), (s), (n))
#else
@@ -126,7 +126,7 @@ extern void bmove512(gptr dst,const gptr src,uint len);
#endif
#if !defined(HAVE_BMOVE) && !defined(bmove)
-extern void bmove(gptr dst,const char *src,uint len);
+extern void bmove(char *dst, const char *src,uint len);
#endif
extern void bmove_upp(char *dst,const char *src,uint len);