From: Bruno Haible <bruno@clisp.org>
Date: Fri, 3 Jun 2011 08:45:34 +0000 (+0200)
Subject: Update from gnulib.
X-Git-Tag: v0.18.2~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=193b9fc007a23d10561e88311b690fe82c8406c3;p=thirdparty%2Fgettext.git

Update from gnulib.
---

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 13a8bf96e..04bf6e039 100644
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* relocatable.c (_GL_USE_STDLIB_ALLOC): Define.
+	(malloc): Don't #undef; no longer needed.
+
 2011-02-28  Bruno Haible  <bruno@clisp.org>
 
 	Assume ANSI C behaviour of free().
diff --git a/gettext-runtime/intl/relocatable.c b/gettext-runtime/intl/relocatable.c
index cbff85fa6..a7bbd99dc 100644
--- a/gettext-runtime/intl/relocatable.c
+++ b/gettext-runtime/intl/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;