diff options
| author | Jim Meyering <jim@meyering.net> | 1996-06-11 17:19:31 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1996-06-11 17:19:31 +0000 |
| commit | 9b647bea250faf31f6e8d1a9cbe1dd362de73218 (patch) | |
| tree | dc7ca0aa5f21fa644c94fb8f94cf1f207a50a060 /intl/libgettext.h | |
| parent | f62de6194aad3ace0c12b414f05486338491c6f6 (diff) | |
| download | idutils-9b647bea250faf31f6e8d1a9cbe1dd362de73218.tar.gz idutils-9b647bea250faf31f6e8d1a9cbe1dd362de73218.tar.bz2 idutils-9b647bea250faf31f6e8d1a9cbe1dd362de73218.zip | |
merge with 0.10.17
Diffstat (limited to 'intl/libgettext.h')
| -rw-r--r-- | intl/libgettext.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/intl/libgettext.h b/intl/libgettext.h index 528b0f2..05463ec 100644 --- a/intl/libgettext.h +++ b/intl/libgettext.h @@ -1,5 +1,5 @@ /* libgettext.h -- Message catalogs for internationalization. - Copyright (C) 1995 Free Software Foundation, Inc. + Copyright (C) 1995, 1996 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -128,20 +128,24 @@ extern char *bindtextdomain__ PARAMS ((const char *__domainname, has dcgettext. */ # if !HAVE_CATGETS && (!HAVE_GETTEXT || HAVE_DCGETTEXT) -# define gettext(Msgid) \ +# define gettext(Msgid) \ dgettext (NULL, Msgid) -# define dgettext(Domainname, Msgid) \ +# define dgettext(Domainname, Msgid) \ dcgettext (Domainname, Msgid, LC_MESSAGES) # if defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ >= 7 -# define dcgettext(Domainname, Msgid, Category) \ +/* This global variable is defined in loadmsgcat.c. We need a sign, + whether a new catalog was loaded, which can be associated with all + translations. */ +extern int _nl_msg_cat_cntr; + +# define dcgettext(Domainname, Msgid, Category) \ (__extension__ \ ({ \ char *result; \ if (__builtin_constant_p (Msgid)) \ { \ - extern int _nl_msg_cat_cntr; \ static char *__translation__; \ static int __catalog_counter__; \ if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr) \ |