Update from gnulib.

bhaible · bhaible · commit 37db12b821ba · 2011-08-07T19:48:03.000+02:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-07  Bruno Haible  <bruno@clisp.org>
+
+	* lib/relocatable.c: Update from gnulib.
+
 2011-08-06  Bruno Haible  <bruno@clisp.org>
 
 	Upgrade the GB18030 converter to the version from 2005.
diff --git a/lib/relocatable.c b/lib/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;
diff --git a/libcharset/lib/ChangeLog b/libcharset/lib/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-07  Bruno Haible  <bruno@clisp.org>
+
+	* relocatable.c: Update from gnulib.
+
 2011-02-28  Bruno Haible  <bruno@clisp.org>
 
 	Assume ANSI C behaviour of free().
diff --git a/libcharset/lib/relocatable.c b/libcharset/lib/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;
