projects
/
debian
/
gzip
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 1.5
[debian/gzip]
/
lib
/
malloc.c
diff --git
a/lib/malloc.c
b/lib/malloc.c
index d9eec75e5d114cced0bb6ead665fabbdea15f375..e0d5c89d189acf2393fe48da2de88f2ab364a962 100644
(file)
--- a/
lib/malloc.c
+++ b/
lib/malloc.c
@@
-1,8
+1,6
@@
-/* -*- buffer-read-only: t -*- vi: set ro: */
-/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
/* malloc() function that is glibc compatible.
/* malloc() function that is glibc compatible.
- Copyright (C) 1997-1998, 2006-2007, 2009-201
0
Free Software Foundation, Inc.
+ Copyright (C) 1997-1998, 2006-2007, 2009-201
2
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
@@
-15,26
+13,25
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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 */
/* 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
#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
#endif
-/* Specification. */
#include <stdlib.h>
#include <errno.h>
#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. */
/* Allocate an N-byte block of memory from the heap.
If N is zero, allocate a 1-byte block. */
@@
-43,7
+40,7
@@
rpl_malloc (size_t n)
{
void *result;
{
void *result;
-#if
def
NEED_MALLOC_GNU
+#if NEED_MALLOC_GNU
if (n == 0)
n = 1;
#endif
if (n == 0)
n = 1;
#endif