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

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

diff --git a/ChangeLog b/ChangeLog
index 3f31057276..a14bb328c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@
 	* lib/canonicalize-lgpl.c (_GL_USE_STDLIB_ALLOC, malloc): Likewise.
 	* 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.
 
 	careadlinkat: rename members to avoid problem
 	* lib/allocator.h (struct allocator): Rename members from
diff --git a/lib/malloc.c b/lib/malloc.c
index 73c503fac7..ef07f6c427 100644
--- a/lib/malloc.c
+++ b/lib/malloc.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_MALLOC macro defines 'malloc' already in config.h.  */
 #ifdef malloc
@@ -28,14 +29,10 @@
 # define NEED_MALLOC_GNU 1
 #endif
 
-/* Specification.  */
 #include <stdlib.h>
 
 #include <errno.h>
 
-/* Call the system's malloc below.  */
-#undef malloc
-
 /* Allocate an N-byte block of memory from the heap.
    If N is zero, allocate a 1-byte block.  */