diff options
| author | Joerg Bruehe <joerg.bruehe@oracle.com> | 2012-02-16 16:03:43 +0100 |
|---|---|---|
| committer | Joerg Bruehe <joerg.bruehe@oracle.com> | 2012-02-16 16:03:43 +0100 |
| commit | 8674517dd448a2d692e1044b5f92245722bfae31 (patch) | |
| tree | d8fe1d2f0576852f303607d24f0e1c6c16e58752 /include/m_string.h | |
| parent | 6b7f9c0aec2e3af594f4779aec9b12010d84f4bb (diff) | |
| parent | d18a6702aa49c694473eddd77780e334d21c06ca (diff) | |
| download | mariadb-git-8674517dd448a2d692e1044b5f92245722bfae31.tar.gz | |
Upmerge the AIX compile fix into 5.5.
Diffstat (limited to 'include/m_string.h')
| -rw-r--r-- | include/m_string.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/m_string.h b/include/m_string.h index e1a4efdfc9b..5e743258baa 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) +#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 |