From: Bruno Haible Date: Mon, 23 Jun 2003 09:53:31 +0000 (+0000) Subject: More robust _INTL_REDIRECT_* handling. X-Git-Tag: v0.13~418 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71a0c22bbc7ee3153c8b7abaebc7311fc0cc5c02;p=thirdparty%2Fgettext.git More robust _INTL_REDIRECT_* handling. --- diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index f2645f87c..7c53ccafe 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,9 @@ +2003-06-22 Bruno Haible + + * gettextP.h: Undefine _INTL_REDIRECT_INLINE, _INTL_REDIRECT_MACROS, + possibly defined in config.h, before setting _INTL_REDIRECT_MACROS. + Reported by Pavel Roskin . + 2003-06-19 Bruno Haible * printf-args.h: New file, from ../libasprintf. diff --git a/gettext-runtime/intl/gettextP.h b/gettext-runtime/intl/gettextP.h index f1748a356..ecb734f94 100644 --- a/gettext-runtime/intl/gettextP.h +++ b/gettext-runtime/intl/gettextP.h @@ -210,6 +210,8 @@ extern char *__bind_textdomain_codeset PARAMS ((const char *__domainname, #else /* Declare the exported libintl_* functions, in a way that allows us to call them under their real name. */ +# undef _INTL_REDIRECT_INLINE +# undef _INTL_REDIRECT_MACROS # define _INTL_REDIRECT_MACROS # include "libgnuintl.h" extern char *libintl_dcigettext PARAMS ((const char *__domainname,