Mercurial > gnulib

changeset 13436:cb3c3063dacf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix HAVE_REALLOC_POSIX misnomer.
author Bruno Haible <bruno@clisp.org>
date Tue, 22 Jun 2010 00:11:19 +0200
parents 90d8e475ab29
children 24728c5de40b
files ChangeLog lib/stdlib.in.h m4/realloc.m4 m4/stdlib_h.m4 modules/stdlib
diffstat 5 files changed, 14 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Jun 22 00:07:30 2010 +0200
+++ b/ChangeLog	Tue Jun 22 00:11:19 2010 +0200
@@ -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.
--- a/lib/stdlib.in.h	Tue Jun 22 00:07:30 2010 +0200
+++ b/lib/stdlib.in.h	Tue Jun 22 00:11:19 2010 +0200
@@ -477,7 +477,7 @@
 
 
 #if @GNULIB_REALLOC_POSIX@
-# if !@HAVE_REALLOC_POSIX@
+# if @REPLACE_REALLOC@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef realloc
 #   define realloc rpl_realloc
--- a/m4/realloc.m4	Tue Jun 22 00:07:30 2010 +0200
+++ b/m4/realloc.m4	Tue Jun 22 00:11:19 2010 +0200
@@ -40,5 +40,5 @@
 AC_DEFUN([gl_REPLACE_REALLOC],
 [
   AC_LIBOBJ([realloc])
-  HAVE_REALLOC_POSIX=0
+  REPLACE_REALLOC=1
 ])
--- a/m4/stdlib_h.m4	Tue Jun 22 00:07:30 2010 +0200
+++ b/m4/stdlib_h.m4	Tue Jun 22 00:11:19 2010 +0200
@@ -88,7 +88,6 @@
   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 @@
   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])
--- a/modules/stdlib	Tue Jun 22 00:07:30 2010 +0200
+++ b/modules/stdlib	Tue Jun 22 00:11:19 2010 +0200
@@ -66,7 +66,6 @@
 	      -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 @@
 	      -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' \