Imported Upstream version 1.24

[tar] / gnu / malloc.c

diff --git a/gnu/malloc.c b/gnu/malloc.c
index d9eec75e5d114cced0bb6ead665fabbdea15f375..3daa8582df0d2367086355e2ca8a090b36684c27 100644 (file)
--- a/gnu/malloc.c
+++ b/gnu/malloc.c
@@ -23,8 +23,11 @@
 #include <config.h>
 /* Only the AC_FUNC_MALLOC macro defines 'malloc' already in config.h.  */
 #ifdef malloc
-# define NEED_MALLOC_GNU
+# define NEED_MALLOC_GNU 1
 # undef malloc
+/* Whereas the gnulib module 'malloc-gnu' defines HAVE_MALLOC_GNU.  */
+#elif GNULIB_MALLOC_GNU && !HAVE_MALLOC_GNU
+# define NEED_MALLOC_GNU 1
 #endif
 
 /* Specification.  */
@@ -43,7 +46,7 @@ rpl_malloc (size_t n)
 {
   void *result;
 
-#ifdef NEED_MALLOC_GNU
+#if NEED_MALLOC_GNU
   if (n == 0)
     n = 1;
 #endif