From 3906b13fc362c74dfaae649ccc8f4b2cdecca35a Mon Sep 17 00:00:00 2001
From: Joerg Bruehe <joerg.bruehe@oracle.com>
Date: Thu, 19 Jan 2012 17:05:47 +0100
Subject: [PATCH] Compile fix needed for AIX, to work around the lack of a
 bzero() prototype.

---
 include/m_string.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/m_string.h b/include/m_string.h
index e1cf7651519..dc916792f60 100644
--- a/include/m_string.h
+++ b/include/m_string.h
@@ -60,7 +60,9 @@
 # define bfill(A,B,C)           memset((A),(C),(B))
 #endif
 
-#if !defined(bzero) && (!defined(HAVE_BZERO) || !defined(HAVE_DECL_BZERO))
+#if !defined(bzero) && (!defined(HAVE_BZERO) || !HAVE_DECL_BZERO || defined(_AIX))
+/* See autoconf doku: "HAVE_DECL_symbol" will be defined after configure, to 0 or 1 */
+/* AIX has bzero() as a function, but the declaration prototype is strangely hidden */
 # define bzero(A,B)             memset((A),0,(B))
 #endif