diff options
| author | Joerg Bruehe <joerg.bruehe@oracle.com> | 2012-02-16 15:55:53 +0100 |
|---|---|---|
| committer | Joerg Bruehe <joerg.bruehe@oracle.com> | 2012-02-16 15:55:53 +0100 |
| commit | 03cdce722749408ab241b79099f8afed2bee9ffa (patch) | |
| tree | 922164f3d7aaa81b9121e4b45f02192f52b416f5 /include | |
| parent | 0966b866b1ac8a9132f917c29244c31f99bb3893 (diff) | |
| parent | 3906b13fc362c74dfaae649ccc8f4b2cdecca35a (diff) | |
| download | mariadb-git-03cdce722749408ab241b79099f8afed2bee9ffa.tar.gz | |
Merge compile fix for AIX into delivery tree.
Diffstat (limited to 'include')
| -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 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 |