diff options
| author | Stephen Kitt <skitt@debian.org> | 2016-05-27 10:11:04 +0200 |
|---|---|---|
| committer | Manuel A. Fernandez Montecelo <manuel.montezelo@gmail.com> | 2016-05-27 14:28:33 +0100 |
| commit | 752fd7247bc223bcea35bd89cf56d1c08ead9ba6 (patch) | |
| tree | b4a428f847a963738faaf24c8eff070fdb03a3a5 /lib/malloc.c | |
| parent | 9f7d4fa477ff2a51d7c932b13d57ac22dc033105 (diff) | |
| parent | a9a31b1de5776a3b08a82101a4fa711294f0dd1d (diff) | |
Imported Debian patch 0.9.6+really0.9.3-0.1debian/0.9.6+really0.9.3-0.1
Diffstat (limited to 'lib/malloc.c')
| -rw-r--r-- | lib/malloc.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/lib/malloc.c b/lib/malloc.c index 7622f4d9..614320c4 100644 --- a/lib/malloc.c +++ b/lib/malloc.c @@ -1,6 +1,6 @@ /* malloc() function that is glibc compatible. - Copyright (C) 1997-1998, 2006-2007, 2009-2015 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 Lesser General Public License as published by @@ -13,25 +13,26 @@ GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, see <http://www.gnu.org/licenses/>. */ + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* 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 1 +# define NEED_MALLOC_GNU # 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. */ @@ -40,7 +41,7 @@ rpl_malloc (size_t n) { void *result; -#if NEED_MALLOC_GNU +#ifdef NEED_MALLOC_GNU if (n == 0) n = 1; #endif |