More robust _INTL_REDIRECT_* handling.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index f2645f87c9ead62a4b68f38a2b00ce4b5104a348..7c53ccafe4907c6de06374e3bfa7d36766ae3b96 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-22  Bruno Haible  <bruno@clisp.org>
+
+       * gettextP.h: Undefine _INTL_REDIRECT_INLINE, _INTL_REDIRECT_MACROS,
+       possibly defined in config.h, before setting _INTL_REDIRECT_MACROS.
+       Reported by Pavel Roskin <proski@gnu.org>.
+
 2003-06-19  Bruno Haible  <bruno@clisp.org>
 
        * printf-args.h: New file, from ../libasprintf.

diff --git a/gettext-runtime/intl/gettextP.h b/gettext-runtime/intl/gettextP.h
index f1748a3567cbc92604eafe1d8b0a7edddac982e3..ecb734f94c1ba24ae97a1afcbb61704ca0049c34 100644 (file)
--- 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,