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 /include | |
| 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 'include')
| -rw-r--r-- | include/libintl.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/include/libintl.h b/include/libintl.h index dc54ccfc7b..a4d6148d8d 100644 --- a/include/libintl.h +++ b/include/libintl.h @@ -8,12 +8,16 @@ extern char *__dgettext (__const char *__domainname, __const char *__msgid); extern char *__dcgettext (__const char *__domainname, __const char *__msgid, int __category); +extern char *__dcgettext_internal (__const char *__domainname, + __const char *__msgid, int __category) + attribute_hidden; extern char *__textdomain (__const char *__domainname); extern char *__bindtextdomain (__const char *__domainname, __const char *__dirname); extern char *__bind_textdomain_codeset (__const char *__domainname, __const char *__codeset); extern const char _libc_intl_domainname[]; +extern const char _libc_intl_domainname_internal[] attribute_hidden; /* Define the macros `_' and `N_' for conveniently marking translatable strings in the libc source code. We have to make sure we get the @@ -24,6 +28,12 @@ extern const char _libc_intl_domainname[]; # undef _ /* This is defined as an optimizing macro, so use it. */ -# define _(msgid) __dcgettext (_libc_intl_domainname, (msgid), LC_MESSAGES) +# if !defined NOT_IN_LIBC && defined SHARED +# define _(msgid) \ + __dcgettext_internal (_libc_intl_domainname_internal, (msgid), LC_MESSAGES) +# else +# define _(msgid) \ + __dcgettext (_libc_intl_domainname, (msgid), LC_MESSAGES) +#endif #endif |