Fix HAVE_REALLOC_POSIX misnomer.

diff --git a/ChangeLog b/ChangeLog
index 339208bb8c5ff44500ca90749bdddc5919ddcd70..f923ed22bebe54228b535b62a89f42e2399ae294 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2010-06-21  Bruno Haible  <bruno@clisp.org>
 
+       Fix HAVE_REALLOC_POSIX misnomer.
+       * lib/stdlib.in.h (realloc): Use REPLACE_REALLOC instead of
+       !HAVE_REALLOC_POSIX.
+       * m4/realloc.m4 (gl_REPLACE_REALLOC): Set REPLACE_REALLOC instead of
+       HAVE_REALLOC_POSIX.
+       * m4/stdlib_h.m4 (gl_STDLIB_H_DEFAULTS): Initialize REPLACE_REALLOC
+       instead of HAVE_REALLOC_POSIX.
+       * modules/stdlib (Makefile.am): Substitute REPLACE_REALLOC instead of
+       HAVE_REALLOC_POSIX.
+
        Use modern idiom for realloc() replacement.
        * modules/realloc (configure.ac): Invoke gl_FUNC_REALLOC_GNU instead of
        AC_FUNC_REALLOC.

diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h
index 449e377439396f1bd5d795816e57cbe990382c40..4ea0b2682deb417aa56e1d76fecfbe128cf12a58 100644 (file)
--- a/lib/stdlib.in.h
+++ b/lib/stdlib.in.h
@@ -477,7 +477,7 @@ _GL_WARN_ON_USE (setstate_r, "setstate_r is unportable - "
 
 
 #if @GNULIB_REALLOC_POSIX@
-# if !@HAVE_REALLOC_POSIX@
+# if @REPLACE_REALLOC@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef realloc
 #   define realloc rpl_realloc

diff --git a/m4/realloc.m4 b/m4/realloc.m4
index 0b8855656b632dce3d787b4f69d75568361733ef..3e97b1da967ca600e04ed946c9ab65f909035576 100644 (file)
--- a/m4/realloc.m4
+++ b/m4/realloc.m4
@@ -40,5 +40,5 @@ AC_DEFUN([gl_FUNC_REALLOC_POSIX],
 AC_DEFUN([gl_REPLACE_REALLOC],
 [
   AC_LIBOBJ([realloc])
-  HAVE_REALLOC_POSIX=0
+  REPLACE_REALLOC=1
 ])

diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4
index 688d7057238bbf9118f0f3616e4829e6cb22be01..2ffb69057e1dbaa952e36c691e010a2c819fbeb1 100644 (file)
--- a/m4/stdlib_h.m4
+++ b/m4/stdlib_h.m4
@@ -88,7 +88,6 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
   HAVE_MKSTEMPS=1;           AC_SUBST([HAVE_MKSTEMPS])
   HAVE_PTSNAME=1;            AC_SUBST([HAVE_PTSNAME])
   HAVE_RANDOM_R=1;           AC_SUBST([HAVE_RANDOM_R])
-  HAVE_REALLOC_POSIX=1;      AC_SUBST([HAVE_REALLOC_POSIX])
   HAVE_REALPATH=1;           AC_SUBST([HAVE_REALPATH])
   HAVE_RPMATCH=1;            AC_SUBST([HAVE_RPMATCH])
   HAVE_SETENV=1;             AC_SUBST([HAVE_SETENV])
@@ -103,6 +102,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
   REPLACE_MALLOC=0;          AC_SUBST([REPLACE_MALLOC])
   REPLACE_MKSTEMP=0;         AC_SUBST([REPLACE_MKSTEMP])
   REPLACE_PUTENV=0;          AC_SUBST([REPLACE_PUTENV])
+  REPLACE_REALLOC=0;         AC_SUBST([REPLACE_REALLOC])
   REPLACE_REALPATH=0;        AC_SUBST([REPLACE_REALPATH])
   REPLACE_SETENV=0;          AC_SUBST([REPLACE_SETENV])
   REPLACE_STRTOD=0;          AC_SUBST([REPLACE_STRTOD])

diff --git a/modules/stdlib b/modules/stdlib
index 9339a04a5c221799fc2f709cf1867ecbbf2c816d..7fb020bcd0aeeb57c653f84bc2a445dcfd760e36 100644 (file)
--- a/modules/stdlib
+++ b/modules/stdlib
@@ -66,7 +66,6 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
              -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \
              -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \
              -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
-             -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \
              -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \
              -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \
              -e 's|@''HAVE_SETENV''@|$(HAVE_SETENV)|g' \
@@ -81,6 +80,7 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
              -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \
              -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
              -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
+             -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \
              -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \
              -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \
              -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \