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

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

diff --git a/ChangeLog b/ChangeLog
index 1a413bc06e..753536ee48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
 	* lib/progreloc.c (_GL_USE_STDLIB_ALLOC, malloc): Likewise.
 	* lib/setenv.c (_GL_USE_STDLIB_ALLOC, malloc, realloc): Likewise.
 	* lib/canonicalize-lgpl.c (_GL_USE_STDLIB_ALLOC, malloc): Likewise.
+	* lib/relocatable.c (_GL_USE_STDLIB_ALLOC, malloc): Likewise.
 
 	careadlinkat: rename members to avoid problem
 	* lib/allocator.h (struct allocator): Rename members from
diff --git a/lib/relocatable.c b/lib/relocatable.c
index cbff85fa62..a7bbd99dca 100644
--- a/lib/relocatable.c
+++ b/lib/relocatable.c
@@ -25,6 +25,7 @@
 # define _GNU_SOURCE 1
 #endif
 
+#define _GL_USE_STDLIB_ALLOC 1
 #include <config.h>
 
 /* Specification.  */
@@ -86,9 +87,6 @@
 # define FILE_SYSTEM_PREFIX_LEN(P) 0
 #endif
 
-/* Use the system functions, not the gnulib overrides in this file.  */
-#undef malloc
-
 /* Original installation prefix.  */
 static char *orig_prefix;
 static size_t orig_prefix_len;