Update.

	* include/libintl.h: Undefine N_ and _ first to avoid warnings.

diff --git a/ChangeLog b/ChangeLog
index e6995d9a8b332a2ee9ecb258ae30b409ac7b47a4..0cec1fc63135f450c8e6254193019d2fab67bafc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 1999-07-23  Ulrich Drepper  <drepper@cygnus.com>
 
+       * include/libintl.h: Undefine N_ and _ first to avoid warnings.
+
        * elf/elf.h: Add ET_LOOS and ET_HIOS.
        Add various EM_* constants.
        Add SHN_LOOS and SHN_HIOS.

diff --git a/include/libintl.h b/include/libintl.h
index a772853c02d06b2c4033993064bb0aa6eddc388c..40342e90c44dd3220fffde3647d32c99deca6c65 100644 (file)
--- a/include/libintl.h
+++ b/include/libintl.h
@@ -9,10 +9,13 @@ extern char *__bindtextdomain __P ((__const char *__domainname,
 extern const char _libc_intl_domainname[];
 
 /* Define the macros `_' and `N_' for conveniently marking translatable
-   strings in the libc source code.  */
+   strings in the libc source code.  We have to make sure we get the
+   correct definitions so we undefine the macros first.  */
 
+# undef N_
 # define N_(msgid)     msgid
 
+# undef _
 # ifdef dgettext
 /* This is defined as an optimizing macro, so use it.  */
 #  define _(msgid)     dgettext (_libc_intl_domainname, (msgid))