Update from gnulib.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 13a8bf96e2ea6f7e2e0a50e86e4f1d6c872813f9..04bf6e039058482095bbfa79b7178a30d0358005 100644 (file)
--- 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 cbff85fa62f9089227439e41c779dda57f73e852..a7bbd99dca78be9628ac6a0edef175a822bcbe93 100644 (file)
--- 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;