From 193b9fc007a23d10561e88311b690fe82c8406c3 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 3 Jun 2011 10:45:34 +0200 Subject: [PATCH] Update from gnulib. --- gettext-runtime/intl/ChangeLog | 5 +++++ gettext-runtime/intl/relocatable.c | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) 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 + + * relocatable.c (_GL_USE_STDLIB_ALLOC): Define. + (malloc): Don't #undef; no longer needed. + 2011-02-28 Bruno Haible 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 /* 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; -- 2.47.2