Make the module 'realloc-gnu' work again on AIX and OSF/1.

diff --git a/ChangeLog b/ChangeLog
index b0c4927..14edae4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,17 @@
 2010-08-29  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
             Bruno Haible  <bruno@clisp.org>
 
+       Make the module 'realloc-gnu' work again on AIX and OSF/1.
+       * m4/realloc.m4 (gl_FUNC_REALLOC_GNU): Define HAVE_REALLOC_GNU instead
+       of HAVE_REALLOC.
+       * lib/realloc.c (NEED_REALLOC_GNU): Enable behaviour also when
+       GNULIB_REALLOC_GNU && !HAVE_REALLOC_GNU.
+       (SYSTEM_MALLOC_GLIBC_COMPATIBLE): Adjust definition.
+       * modules/realloc-gnu (configure.ac): Use gl_MODULE_INDICATOR.
+
+2010-08-29  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+            Bruno Haible  <bruno@clisp.org>
+
        Make the module 'calloc-gnu' work again on AIX and OSF/1.
        * m4/calloc.m4 (gl_FUNC_CALLOC_GNU): Define HAVE_CALLOC_GNU instead of
        HAVE_CALLOC.

diff --git a/lib/realloc.c b/lib/realloc.c
index 36aeecc..053208f 100644 (file)
--- a/lib/realloc.c
+++ b/lib/realloc.c
@@ -23,11 +23,14 @@
 /* Only the AC_FUNC_REALLOC macro defines 'realloc' already in config.h.  */
 #ifdef realloc
 # define NEED_REALLOC_GNU 1
+/* Whereas the gnulib module 'realloc-gnu' defines HAVE_REALLOC_GNU.  */
+#elif GNULIB_REALLOC_GNU && !HAVE_REALLOC_GNU
+# define NEED_REALLOC_GNU 1
 #endif
 
 /* Infer the properties of the system's malloc function.
-   Only the AC_FUNC_MALLOC macro defines 'malloc' already in config.h.  */
-#if GNULIB_MALLOC_GNU && !defined malloc
+   The gnulib module 'malloc-gnu' defines HAVE_MALLOC_GNU.  */
+#if GNULIB_MALLOC_GNU && HAVE_MALLOC_GNU
 # define SYSTEM_MALLOC_GLIBC_COMPATIBLE 1
 #endif
 

diff --git a/m4/realloc.m4 b/m4/realloc.m4
index 3e97b1d..01c1234 100644 (file)
--- a/m4/realloc.m4
+++ b/m4/realloc.m4
@@ -1,4 +1,4 @@
-# realloc.m4 serial 10
+# realloc.m4 serial 11
 dnl Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -13,10 +13,10 @@ AC_DEFUN([gl_FUNC_REALLOC_GNU],
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
   dnl _AC_FUNC_REALLOC_IF is defined in Autoconf.
   _AC_FUNC_REALLOC_IF(
-    [AC_DEFINE([HAVE_REALLOC], [1],
+    [AC_DEFINE([HAVE_REALLOC_GNU], [1],
                [Define to 1 if your system has a GNU libc compatible 'realloc'
                 function, and to 0 otherwise.])],
-    [AC_DEFINE([HAVE_REALLOC], [0])
+    [AC_DEFINE([HAVE_REALLOC_GNU], [0])
      gl_REPLACE_REALLOC
     ])
 ])# gl_FUNC_REALLOC_GNU

diff --git a/modules/realloc-gnu b/modules/realloc-gnu
index d4f2167..f059976 100644 (file)
--- a/modules/realloc-gnu
+++ b/modules/realloc-gnu
@@ -14,7 +14,7 @@ realloc-posix
 
 configure.ac:
 gl_FUNC_REALLOC_GNU
-AC_DEFINE([GNULIB_REALLOC_GNU], 1, [Define to indicate the 'realloc' module.])
+gl_MODULE_INDICATOR([realloc-gnu])
 
 Makefile.am: