projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vasnprintf test: Reduce code duplication.
[gnulib.git]
/
lib
/
malloc.c
diff --git
a/lib/malloc.c
b/lib/malloc.c
index
ca04c57
..
f236f37
100644
(file)
--- a/
lib/malloc.c
+++ b/
lib/malloc.c
@@
-1,5
+1,6
@@
/* malloc() function that is glibc compatible.
/* malloc() function that is glibc compatible.
- Copyright (C) 1997, 1998 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
@@
-13,24
+14,44
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
-/* written by Jim Meyering */
+/* written by Jim Meyering
and Bruno Haible
*/
-#if HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
+/* Only the AC_FUNC_MALLOC macro defines 'malloc' already in config.h. */
+#ifdef malloc
+# define NEED_MALLOC_GNU
+# undef malloc
#endif
#endif
-#undef malloc
+/* Specification. */
#include <stdlib.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. */
void *
rpl_malloc (size_t n)
{
/* Allocate an N-byte block of memory from the heap.
If N is zero, allocate a 1-byte block. */
void *
rpl_malloc (size_t n)
{
+ void *result;
+
+#ifdef NEED_MALLOC_GNU
if (n == 0)
n = 1;
if (n == 0)
n = 1;
- return malloc (n);
+#endif
+
+ result = malloc (n);
+
+#if !HAVE_MALLOC_POSIX
+ if (result == NULL)
+ errno = ENOMEM;
+#endif
+
+ return result;
}
}