projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests for module 'unicase/u16-is-uppercase'.
[gnulib.git]
/
lib
/
realloc.c
diff --git
a/lib/realloc.c
b/lib/realloc.c
index
b1c0450
..
b61c2ca
100644
(file)
--- a/
lib/realloc.c
+++ b/
lib/realloc.c
@@
-2,10
+2,10
@@
Copyright (C) 1997, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
Copyright (C) 1997, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
- This program is free software
;
you can redistribute it and/or modify
+ 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
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ the Free Software Foundation; either version
3 of the License, or
+
(at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-13,24
+13,37
@@
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 */
#include <config.h>
/* written by Jim Meyering and Bruno Haible */
#include <config.h>
+
/* Only the AC_FUNC_REALLOC macro defines 'realloc' already in config.h. */
#ifdef realloc
/* Only the AC_FUNC_REALLOC macro defines 'realloc' already in config.h. */
#ifdef realloc
-# define NEED_REALLOC_GNU
-# undef realloc
+# define NEED_REALLOC_GNU 1
+#endif
+
+/* Infer the properties of the system's malloc function.
+ Only the AC_FUNC_MALLOC macro defines 'malloc' already in config.h. */
+#if GNULIB_MALLOC_GNU && !defined malloc
+# define SYSTEM_MALLOC_GLIBC_COMPATIBLE 1
#endif
#endif
+/* Below we want to call the system's malloc and realloc.
+ Undefine the symbols here so that including <stdlib.h> provides a
+ declaration of malloc(), not of rpl_malloc(), and likewise for realloc. */
+#undef malloc
+#undef realloc
+
/* Specification. */
#include <stdlib.h>
#include <errno.h>
/* Specification. */
#include <stdlib.h>
#include <errno.h>
-/* Call the system's malloc and realloc below. */
+/* Below we want to call the system's malloc and realloc.
+ Undefine the symbols, if they were defined by gnulib's <stdlib.h>
+ replacement. */
#undef malloc
#undef realloc
#undef malloc
#undef realloc
@@
-43,7
+56,7
@@
rpl_realloc (void *p, size_t n)
{
void *result;
{
void *result;
-#if
def
NEED_REALLOC_GNU
+#if NEED_REALLOC_GNU
if (n == 0)
{
n = 1;
if (n == 0)
{
n = 1;
@@
-54,7
+67,16
@@
rpl_realloc (void *p, size_t n)
}
#endif
}
#endif
- result = (p == NULL ? malloc (n) : realloc (p, n));
+ if (p == NULL)
+ {
+#if GNULIB_REALLOC_GNU && !NEED_REALLOC_GNU && !SYSTEM_MALLOC_GLIBC_COMPATIBLE
+ if (n == 0)
+ n = 1;
+#endif
+ result = malloc (n);
+ }
+ else
+ result = realloc (p, n);
#if !HAVE_REALLOC_POSIX
if (result == NULL)
#if !HAVE_REALLOC_POSIX
if (result == NULL)