summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2010-07-02 19:02:28 -0300
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2010-07-02 19:02:28 -0300
commit93deacecb58b5771965c3bc44fce47a1a8bc519d (patch)
treebb1b133a543d25a8c8e65ec0230a13f9f070992d /include
parent74283a052e092d822091343dc236debf0aaf55cc (diff)
parent082036ac6bef777ce112515a8804ee5d66368715 (diff)
downloadmariadb-git-93deacecb58b5771965c3bc44fce47a1a8bc519d.tar.gz
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'include')
-rw-r--r--include/m_string.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/m_string.h b/include/m_string.h
index c3dcf19e73d..2e443a87736 100644
--- a/include/m_string.h
+++ b/include/m_string.h
@@ -61,6 +61,10 @@
# define bfill(A,B,C) memset((A),(C),(B))
#endif
+#if !defined(bzero) && !defined(HAVE_BZERO)
+# define bzero(A,B) memset((A),0,(B))
+#endif
+
#if defined(__cplusplus)
extern "C" {
#endif
@@ -104,10 +108,6 @@ extern char NEAR _dig_vec_lower[];
extern void bfill(uchar *dst,size_t len,pchar fill);
#endif
-#if !defined(bzero) && !defined(HAVE_BZERO)
-extern void bzero(uchar * dst,size_t len);
-#endif
-
#ifndef bmove512
extern void bmove512(uchar *dst,const uchar *src,size_t len);
#endif