From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 8 Apr 2011 18:39:01 +0000 (-0700)
Subject: * lib/realloc.c (_GL_USE_STDLIB_ALLOC, malloc, realloc): Likewise.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=003d30375c85c07eb8fc0ad805cf0a0cb146265e;p=pspp

* lib/realloc.c (_GL_USE_STDLIB_ALLOC, malloc, realloc): Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index a14bb328c9..38777e072b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@
 	* lib/relocatable.c (_GL_USE_STDLIB_ALLOC, malloc): Likewise.
 	* lib/relocwrapper.c (_GL_USE_STDLIB_ALLOC, malloc): Likewise.
 	* lib/malloc.c (_GL_USE_STDLIB_ALLOC, malloc): Likewise.
+	* lib/realloc.c (_GL_USE_STDLIB_ALLOC, malloc, realloc): Likewise.
 
 	careadlinkat: rename members to avoid problem
 	* lib/allocator.h (struct allocator): Rename members from
diff --git a/lib/realloc.c b/lib/realloc.c
index 6ef37e794f..0c96ffacba 100644
--- a/lib/realloc.c
+++ b/lib/realloc.c
@@ -18,6 +18,7 @@
 
 /* written by Jim Meyering and Bruno Haible */
 
+#define _GL_USE_STDLIB_ALLOC 1
 #include <config.h>
 
 /* Only the AC_FUNC_REALLOC macro defines 'realloc' already in config.h.  */
@@ -34,23 +35,10 @@
 # define SYSTEM_MALLOC_GLIBC_COMPATIBLE 1
 #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>
 
-/* 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
-
 /* Change the size of an allocated block of memory P to N bytes,
    with error checking.  If N is zero, change it to 1.  If P is NULL,
    use malloc.  */