diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2002-04-08 08:59:00 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2002-04-08 08:59:00 +0000 |
| commit | 71319b9cb3143578ffdb8421e99bf1a02684b2ea (patch) | |
| tree | e3c181443f8441cd0c0c657ed92904ff6e0261c7 /argp | |
| parent | 5f00a0330ab65e968321c2d1464a3b94279612bc (diff) | |
| download | glibc-71319b9cb3143578ffdb8421e99bf1a02684b2ea.tar.gz glibc-71319b9cb3143578ffdb8421e99bf1a02684b2ea.tar.xz glibc-71319b9cb3143578ffdb8421e99bf1a02684b2ea.zip | |
Update.
2002-04-08 Ulrich Drepper <drepper@redhat.com> * Makeconfig (CPPFLAGS): Also add CPPFLAGS-<basename> where <basename> 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.
Diffstat (limited to 'argp')
| -rw-r--r-- | argp/argp-help.c | 5 | ||||
| -rw-r--r-- | argp/argp-parse.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/argp/argp-help.c b/argp/argp-help.c index e51825c28b..af23d93fe2 100644 --- a/argp/argp-help.c +++ b/argp/argp-help.c @@ -1,5 +1,5 @@ /* Hierarchial argument parsing help output - Copyright (C) 1995-2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995-2000, 2001, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader <miles@gnu.ai.mit.edu>. @@ -62,7 +62,8 @@ char *alloca (); # include <libintl.h> # ifdef _LIBC # undef dgettext -# define dgettext(domain, msgid) __dcgettext (domain, msgid, LC_MESSAGES) +# define dgettext(domain, msgid) \ + INTUSE(__dcgettext) (domain, msgid, LC_MESSAGES) # endif # else # define dgettext(domain, msgid) (msgid) diff --git a/argp/argp-parse.c b/argp/argp-parse.c index 5a5146fba3..6d5f08cf83 100644 --- a/argp/argp-parse.c +++ b/argp/argp-parse.c @@ -35,7 +35,8 @@ # include <libintl.h> # ifdef _LIBC # undef dgettext -# define dgettext(domain, msgid) __dcgettext (domain, msgid, LC_MESSAGES) +# define dgettext(domain, msgid) \ + INTUSE(__dcgettext) (domain, msgid, LC_MESSAGES) # endif # else # define dgettext(domain, msgid) (msgid) |