summary refs log tree commit diff
path: root/argp
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-10-28 00:45:40 +0000
committerUlrich Drepper <drepper@redhat.com>2000-10-28 00:45:40 +0000
commit0bb258e350ca7864a1db31cb89c4a82602ec3587 (patch)
treeca78f0d6f9a17f5c95dfcb50c3c87e0b0efcf227 /argp
parent9f6c1fc4947e0b6d007cff159166bc0373386c61 (diff)
downloadglibc-0bb258e350ca7864a1db31cb89c4a82602ec3587.tar.gz
glibc-0bb258e350ca7864a1db31cb89c4a82602ec3587.tar.xz
glibc-0bb258e350ca7864a1db31cb89c4a82602ec3587.zip
Update.
	* posix/regex.c (gettext): Use correct translation domain for glibc.

	* argp/argp-parse.c: Use __dcgettext instead of dcgettext for glibc.
	* argp/argp-help.c: Likewise.
	* inet/getnameinfo.c (getnameinfo): Use __snprintf instead of snprintf.
	* inet/rexec.c (rexec_af): Use __snprintf instead of snprintf.
	* misc/regexp.c (__step): Use __regexec instead of regexec.
	(__advance): Likewise.
	* nss/digits_dots.c: Use __inet_aton instead of inet_aton.
	* misc/daemon.c (daemon): Use __fork instead of fork.
Diffstat (limited to 'argp')
-rw-r--r--argp/argp-help.c4
-rw-r--r--argp/argp-parse.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/argp/argp-help.c b/argp/argp-help.c
index d378faa4a5..5810e70329 100644
--- a/argp/argp-help.c
+++ b/argp/argp-help.c
@@ -57,6 +57,10 @@ char *alloca ();
 /* This is for other GNU distributions with internationalized messages.  */
 # if defined HAVE_LIBINTL_H || defined _LIBC
 #  include <libintl.h>
+#  ifdef _LIBC
+#   undef dgettext
+#   define dgettext(domain, msgid) __dcgettext (domain, msgid, LC_MESSAGES)
+#  endif
 # else
 #  define dgettext(domain, msgid) (msgid)
 # endif
diff --git a/argp/argp-parse.c b/argp/argp-parse.c
index 71b3fb298b..e16b2f78e5 100644
--- a/argp/argp-parse.c
+++ b/argp/argp-parse.c
@@ -33,6 +33,10 @@
    When compiling libc, the _ macro is predefined.  */
 # if defined HAVE_LIBINTL_H || defined _LIBC
 #  include <libintl.h>
+#  ifdef _LIBC
+#   undef dgettext
+#   define dgettext(domain, msgid) __dcgettext (domain, msgid, LC_MESSAGES)
+#  endif
 # else
 #  define dgettext(domain, msgid) (msgid)
 #  define gettext(msgid) (msgid)