diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2011-05-27 08:09:25 -0300 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2011-05-27 08:09:25 -0300 |
| commit | 79de9c71887aafe46efd005be65e8cc596eff5cb (patch) | |
| tree | 5a10f00ea08a59015d354a55f04f310d80df2f37 | |
| parent | 8bb8385f02d36c6ca31ec2036876d891d56134b5 (diff) | |
| download | mariadb-git-79de9c71887aafe46efd005be65e8cc596eff5cb.tar.gz | |
BUG 11763056 - 55721: AIX 5.1.50 build failing, cannot locate bzero
The problem is that although AIX implements bzero, its prototype
is not declared by default. Since AC_CHECK_FUNC(bzero) succeeds
even though a prototype is not declared, this breaks compilation
in C++ files where a prototype is required.
The solution is to only use bzero if a prototype is also declared.
| -rw-r--r-- | configure.in | 7 | ||||
| -rw-r--r-- | include/m_string.h | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/configure.in b/configure.in index 8ba208b1ef5..3603512f3f1 100644 --- a/configure.in +++ b/configure.in @@ -2042,12 +2042,7 @@ MYSQL_TYPE_QSORT AC_FUNC_UTIME_NULL AC_FUNC_VPRINTF -AC_CHECK_DECLS([fdatasync],,, -[ -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -]) +AC_CHECK_DECLS([fdatasync, bzero]) AC_CHECK_FUNCS(alarm bfill bmove bsearch bzero \ chsize cuserid fchmod fcntl \ diff --git a/include/m_string.h b/include/m_string.h index 0d248ea0ad3..53572a4ac9e 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -58,7 +58,7 @@ # define bfill(A,B,C) memset((A),(C),(B)) #endif -#if !defined(bzero) && !defined(HAVE_BZERO) +#if !defined(bzero) && (!defined(HAVE_BZERO) || !defined(HAVE_DECL_BZERO)) # define bzero(A,B) memset((A),0,(B)) #endif |