From 71319b9cb3143578ffdb8421e99bf1a02684b2ea Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 8 Apr 2002 08:59:00 +0000 Subject: Update. 2002-04-08 Ulrich Drepper * Makeconfig (CPPFLAGS): Also add CPPFLAGS- where is the name of the source file without extension. * Makefile (distribute): Add cppflags-iterator.mk. * cppflags-iterator.mk: New file. * extra-lib.mk: For the sources of the library run cppflags-iterator.mk. * include/libintl.h: Declare __dcgettext_internal and _libc_intl_domainname_internal. Define __dcgettext using these two symbols if used in libc itself. * argp/argp-help.c: Define dgettext using __dcgettext_internal and _libc_intl_domainname_internal. * argp/argp-parse.c: Likewise. * intl/dcgettext.c (__dcgettext): Use INTDEF to define alias. * intl/dgettext.c: Call __dcgettext_internal instead of __dcgettext. * intl/gettext.c: Likewise. * locale/SYS_libc.c (_libc_intl_domainname): Use INTDEF to define alias. * posix/regcomp.c (gettext): Use __dcgettext_internal instead of __dcgettext. * posix/regex_internal.c (gettext): Likewise. --- posix/regcomp.c | 3 ++- posix/regex_internal.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'posix') diff --git a/posix/regcomp.c b/posix/regcomp.c index 7e3954fdad..b5f8800569 100644 --- a/posix/regcomp.c +++ b/posix/regcomp.c @@ -42,7 +42,8 @@ # include # ifdef _LIBC # undef gettext -# define gettext(msgid) __dcgettext ("libc", msgid, LC_MESSAGES) +# define gettext(msgid) \ + INTUSE(__dcgettext) (_libc_intl_domainname_internal, msgid, LC_MESSAGES) # endif #else # define gettext(msgid) (msgid) diff --git a/posix/regex_internal.c b/posix/regex_internal.c index c2b0f9b4b0..8b16dd6cef 100644 --- a/posix/regex_internal.c +++ b/posix/regex_internal.c @@ -41,7 +41,8 @@ # include # ifdef _LIBC # undef gettext -# define gettext(msgid) __dcgettext ("libc", msgid, LC_MESSAGES) +# define gettext(msgid) \ + INTUSE(__dcgettext) (_libc_intl_domainname_internal, msgid, LC_MESSAGES) # endif #else # define gettext(msgid) (msgid) -- cgit 1.4.1