projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fts: do not exhaust memory when processing million-entry directories
[gnulib.git]
/
lib
/
malloc.c
diff --git
a/lib/malloc.c
b/lib/malloc.c
index
b6ecf37
..
ef07f6c
100644
(file)
--- a/
lib/malloc.c
+++ b/
lib/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-2011
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
@@
-18,14
+18,17
@@
/* 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>
@@
-38,7
+41,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