List:Commits« Previous MessageNext Message »
From:Davi Arnaut Date:May 27 2011 11:09am
Subject:bzr commit into mysql-5.1 branch (davi:3625)
View as plain text  
# At a local mysql-5.1 repository of davi

 3625 Davi Arnaut	2011-05-27
      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.
     @ configure.in
        Check if bzero is declared. No need to specify the includes,
        unisted.h and strings.h are already part of AC_INCLUDES_DEFAULT.

    modified:
      configure.in
      include/m_string.h
=== modified file 'configure.in'
--- a/configure.in	2011-05-06 08:03:02 +0000
+++ b/configure.in	2011-05-27 11:09:25 +0000
@@ -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 \

=== modified file 'include/m_string.h'
--- a/include/m_string.h	2010-11-20 14:29:51 +0000
+++ b/include/m_string.h	2011-05-27 11:09:25 +0000
@@ -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
 


Attachment: [text/bzr-bundle] bzr/davi.arnaut@oracle.com-20110527110925-zgazdl4cavbp7p73.bundle
Thread
bzr commit into mysql-5.1 branch (davi:3625) Davi Arnaut27 May
Re: bzr commit into mysql-5.1 branch (davi:3625)Tor Didriksen27 May