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

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

diff --git a/ChangeLog b/ChangeLog
index cc2541cd65..1a413bc06e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
 	* lib/malloca.c (_GL_USE_STDLIB_ALLOC, malloc): Likewise.
 	* 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.
 
 	careadlinkat: rename members to avoid problem
 	* lib/allocator.h (struct allocator): Rename members from
diff --git a/lib/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c
index 9bfb44f982..1574ec108c 100644
--- a/lib/canonicalize-lgpl.c
+++ b/lib/canonicalize-lgpl.c
@@ -16,6 +16,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _LIBC
+# define _GL_USE_STDLIB_ALLOC 1
 # include <config.h>
 #endif
 
@@ -68,8 +69,6 @@
 # endif
 # define __readlink readlink
 # define __set_errno(e) errno = (e)
-/* Use the system functions, not the gnulib overrides in this file.  */
-# undef malloc
 # ifndef MAXSYMLINKS
 #  ifdef SYMLOOP_MAX
 #   define MAXSYMLINKS SYMLOOP_MAX