projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add bug closure to changelog
[debian/amanda]
/
gnulib
/
malloc.c
diff --git
a/gnulib/malloc.c
b/gnulib/malloc.c
index f2f66637907ec09e6c710d5be1e951b8705c55ae..4fa38ee41b8dc98df5551aa15b72b0b6535a4a5f 100644
(file)
--- a/
gnulib/malloc.c
+++ b/
gnulib/malloc.c
@@
-1,6
+1,6
@@
/* 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
@@
-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;
-#if
def
NEED_MALLOC_GNU
+#if NEED_MALLOC_GNU
if (n == 0)
n = 1;
#endif
if (n == 0)
n = 1;
#endif