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

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

diff --git a/ChangeLog b/ChangeLog
index deb8c12932..34f6133422 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
 	* lib/careadlinkat.c (_GL_USE_STDLIB_ALLOC): Define.
 	(malloc, realloc): Don't #undef; no longer needed.
 	* lib/malloca.c (_GL_USE_STDLIB_ALLOC, malloc): Likewise.
+	* lib/progreloc.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/progreloc.c b/lib/progreloc.c
index 0769c5e1cb..4a3fa48be4 100644
--- a/lib/progreloc.c
+++ b/lib/progreloc.c
@@ -16,6 +16,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
+#define _GL_USE_STDLIB_ALLOC 1
 #include <config.h>
 
 /* Specification.  */
@@ -94,7 +95,6 @@ extern char * canonicalize_file_name (const char *name);
 #undef close
 
 /* Use the system functions, not the gnulib overrides in this file.  */
-#undef malloc
 #undef sprintf
 
 #undef set_program_name