aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--argp/argp-help.c2
-rw-r--r--argp/argp-parse.c14
3 files changed, 15 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 24811ce..2b8890f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-04 Ulrich Drepper <drepper@redhat.com>
+
+ * argp/argp-help.c: Make sure we get the correct gettext and
+ dgettext definitions.
+ * argp/argp-parse.c: Likewise.
+
2000-10-03 Ulrich Drepper <drepper@redhat.com>
* locale/programs/linereader.c (get_string): Also clear wide
diff --git a/argp/argp-help.c b/argp/argp-help.c
index 394a4ad..d378faa 100644
--- a/argp/argp-help.c
+++ b/argp/argp-help.c
@@ -55,7 +55,7 @@ char *alloca ();
#ifndef _
/* This is for other GNU distributions with internationalized messages. */
-# ifdef HAVE_LIBINTL_H
+# if defined HAVE_LIBINTL_H || defined _LIBC
# include <libintl.h>
# else
# define dgettext(domain, msgid) (msgid)
diff --git a/argp/argp-parse.c b/argp/argp-parse.c
index 0ff8a5b..e54497c 100644
--- a/argp/argp-parse.c
+++ b/argp/argp-parse.c
@@ -31,13 +31,15 @@
#ifndef _
/* This is for other GNU distributions with internationalized messages.
When compiling libc, the _ macro is predefined. */
-#ifdef HAVE_LIBINTL_H
-# include <libintl.h>
-#else
-# define dgettext(domain, msgid) (msgid)
-# define gettext(msgid) (msgid)
+# if defined HAVE_LIBINTL_H || defined _LIBC
+# include <libintl.h>
+# else
+# define dgettext(domain, msgid) (msgid)
+# define gettext(msgid) (msgid)
+# endif
#endif
-#define N_(msgid) (msgid)
+#ifndef N_
+# define N_(msgid) (msgid)
#endif
#if _LIBC - 0