Imported Upstream version 3.2.0

[debian/amanda] / gnulib / malloc.c

diff --git a/gnulib/malloc.c b/gnulib/malloc.c
index eba131d1f273049bbc0f3137ff48f193dee686e1..4fa38ee41b8dc98df5551aa15b72b0b6535a4a5f 100644 (file)
--- a/gnulib/malloc.c
+++ b/gnulib/malloc.c
@@ -1,10 +1,10 @@
 /* malloc() function that is glibc compatible.
 
 /* malloc() function that is glibc compatible.
 

-   Copyright (C) 1997, 1998, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1997-1998, 2006-2007, 2009-2010 Free Software Foundation, Inc.

 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    This program is distributed in the hope that it will be useful,
    any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -21,8 +21,11 @@
 #include <config.h>
 /* Only the AC_FUNC_MALLOC macro defines 'malloc' already in config.h.  */
 #ifdef malloc
 #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
 # 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.  */
 #endif
 
 /* Specification.  */


@@ -41,7 +44,7 @@ rpl_malloc (size_t n)
 {
   void *result;
 
 {
   void *result;
 

-#ifdef NEED_MALLOC_GNU
+#if NEED_MALLOC_GNU

   if (n == 0)
     n = 1;
 #endif
   if (n == 0)
     n = 1;
 #endif