Upmerge the AIX compile fix into 5.5.

8674517d · Joerg Bruehe · 6b7f9c0a · d18a6702 · 8674517d
Commit 8674517d authored Feb 16, 2012 by Joerg Bruehe
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

include/m_string.h include/m_string.h +3 -1

No files found.
--- 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)
+#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