diff options
author | Clint Adams <clint@debian.org> | 2013-05-09 01:03:12 -0400 |
---|---|---|
committer | Clint Adams <clint@debian.org> | 2013-05-09 01:03:12 -0400 |
commit | d75f3c567505ad7acd2c1943207b367593652739 (patch) | |
tree | e519be160770e6b20bfe88eb923ea6aa8edb3e58 /lib/malloc.c | |
parent | 86bbc911e93efe1f0957ee887182b3d64bb0eec4 (diff) |
Imported Upstream version 4.2.2
Diffstat (limited to 'lib/malloc.c')
-rw-r--r-- | lib/malloc.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/lib/malloc.c b/lib/malloc.c index 4738df2..5d05f9f 100644 --- a/lib/malloc.c +++ b/lib/malloc.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* malloc() function that is glibc compatible. - Copyright (C) 1997, 1998, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 1997-1998, 2006-2007, 2009-2012 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 @@ -15,26 +15,25 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program; if not, see <http://www.gnu.org/licenses/>. */ /* written by Jim Meyering and Bruno Haible */ +#define _GL_USE_STDLIB_ALLOC 1 #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. */ #include <stdlib.h> #include <errno.h> -/* Call the system's malloc below. */ -#undef malloc - /* Allocate an N-byte block of memory from the heap. If N is zero, allocate a 1-byte block. */ @@ -43,7 +42,7 @@ rpl_malloc (size_t n) { void *result; -#ifdef NEED_MALLOC_GNU +#if NEED_MALLOC_GNU if (n == 0) n = 1; #endif |