diff options
author | Bruno Haible <bruno@clisp.org> | 2007-09-09 13:01:44 +0000 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2007-09-09 13:01:44 +0000 |
commit | 23631b7e71d7a29c117b092055bfd74e045e72aa (patch) | |
tree | ba7d506f647e41937c51dd1b38cb14ddda5ef769 /lib/malloc.c | |
parent | 471d58a565341806b6ed60b3a4a68a40fb1c932d (diff) | |
download | gnulib-23631b7e71d7a29c117b092055bfd74e045e72aa.tar.gz |
New module 'malloc-posix'.
Diffstat (limited to 'lib/malloc.c')
-rw-r--r-- | lib/malloc.c | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/lib/malloc.c b/lib/malloc.c index d4dae3e182..b6ecf37466 100644 --- a/lib/malloc.c +++ b/lib/malloc.c @@ -1,6 +1,6 @@ /* malloc() function that is glibc compatible. - Copyright (C) 1997, 1998, 2006 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 2006, 2007 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 @@ -16,20 +16,39 @@ 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 */ +/* written by Jim Meyering and Bruno Haible */ #include <config.h> -#undef malloc +/* Only the AC_FUNC_MALLOC macro defines 'malloc' already in config.h. */ +#ifdef malloc +# define NEED_MALLOC_GNU +# undef malloc +#endif +/* Specification. */ #include <stdlib.h> +#include <errno.h> + /* 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; - return malloc (n); +#endif + + result = malloc (n); + +#if !HAVE_MALLOC_POSIX + if (result == NULL) + errno = ENOMEM; +#endif + + return result; } |