Fix HAVE_CALLOC_POSIX misnomer.

diff --git a/ChangeLog b/ChangeLog
index fded4ef..29c0096 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2010-06-21  Bruno Haible  <bruno@clisp.org>
 
+       Fix HAVE_CALLOC_POSIX misnomer.
+       * lib/stdlib.in.h (calloc): Use REPLACE_CALLOC instead of
+       !HAVE_CALLOC_POSIX.
+       * m4/calloc.m4 (gl_REPLACE_CALLOC): Set REPLACE_CALLOC instead of
+       HAVE_CALLOC_POSIX.
+       * m4/stdlib_h.m4 (gl_STDLIB_H_DEFAULTS): Initialize REPLACE_CALLOC
+       instead of HAVE_CALLOC_POSIX.
+       * modules/stdlib (Makefile.am): Substitute REPLACE_CALLOC instead of
+       HAVE_CALLOC_POSIX.
+
        Use modern idiom for calloc() replacement.
        * modules/calloc (configure.ac): Invoke gl_FUNC_CALLOC_GNU instead of
        AC_FUNC_CALLOC.

diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h
index 4ea0b26..da16259 100644 (file)
--- a/lib/stdlib.in.h
+++ b/lib/stdlib.in.h
@@ -112,7 +112,7 @@ _GL_WARN_ON_USE (atoll, "atoll is unportable - "
 #endif
 
 #if @GNULIB_CALLOC_POSIX@
-# if !@HAVE_CALLOC_POSIX@
+# if @REPLACE_CALLOC@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef calloc
 #   define calloc rpl_calloc

diff --git a/m4/calloc.m4 b/m4/calloc.m4
index c93e84e..e62da1e 100644 (file)
--- a/m4/calloc.m4
+++ b/m4/calloc.m4
@@ -63,5 +63,5 @@ AC_DEFUN([gl_FUNC_CALLOC_POSIX],
 AC_DEFUN([gl_REPLACE_CALLOC],
 [
   AC_LIBOBJ([calloc])
-  HAVE_CALLOC_POSIX=0
+  REPLACE_CALLOC=1
 ])

diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4
index 2ffb690..b297ee2 100644 (file)
--- a/m4/stdlib_h.m4
+++ b/m4/stdlib_h.m4
@@ -76,7 +76,6 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
   GNULIB_UNSETENV=0;      AC_SUBST([GNULIB_UNSETENV])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_ATOLL=1;              AC_SUBST([HAVE_ATOLL])
-  HAVE_CALLOC_POSIX=1;       AC_SUBST([HAVE_CALLOC_POSIX])
   HAVE_CANONICALIZE_FILE_NAME=1;  AC_SUBST([HAVE_CANONICALIZE_FILE_NAME])
   HAVE_DECL_GETLOADAVG=1;    AC_SUBST([HAVE_DECL_GETLOADAVG])
   HAVE_GETSUBOPT=1;          AC_SUBST([HAVE_GETSUBOPT])
@@ -98,6 +97,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
   HAVE_SYS_LOADAVG_H=0;      AC_SUBST([HAVE_SYS_LOADAVG_H])
   HAVE_UNLOCKPT=1;           AC_SUBST([HAVE_UNLOCKPT])
   HAVE_UNSETENV=1;           AC_SUBST([HAVE_UNSETENV])
+  REPLACE_CALLOC=0;          AC_SUBST([REPLACE_CALLOC])
   REPLACE_CANONICALIZE_FILE_NAME=0;  AC_SUBST([REPLACE_CANONICALIZE_FILE_NAME])
   REPLACE_MALLOC=0;          AC_SUBST([REPLACE_MALLOC])
   REPLACE_MKSTEMP=0;         AC_SUBST([REPLACE_MKSTEMP])

diff --git a/modules/stdlib b/modules/stdlib
index 7fb020b..7af315f 100644 (file)
--- a/modules/stdlib
+++ b/modules/stdlib
@@ -53,7 +53,6 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
              -e 's|@''GNULIB_UNLOCKPT''@|$(GNULIB_UNLOCKPT)|g' \
              -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \
              -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \
-             -e 's|@''HAVE_CALLOC_POSIX''@|$(HAVE_CALLOC_POSIX)|g' \
              -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \
              -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
              -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
@@ -76,6 +75,7 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
              -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \
              -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \
              -e 's|@''HAVE_UNSETENV''@|$(HAVE_UNSETENV)|g' \
+             -e 's|@''REPLACE_CALLOC''@|$(REPLACE_CALLOC)|g' \
              -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \
              -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \
              -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \