aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--include/libintl.h5
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e6995d9a8b..0cec1fc631 100644
--- 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 a772853c02..40342e90c4 100644
--- 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))