diff options
Diffstat (limited to 'intl')
| -rw-r--r-- | intl/gettextP.h | 2 | ||||
| -rw-r--r-- | intl/libintl.h | 29 |
2 files changed, 3 insertions, 28 deletions
diff --git a/intl/gettextP.h b/intl/gettextP.h index 1b4dcb3e07..b3c8c18598 100644 --- a/intl/gettextP.h +++ b/intl/gettextP.h @@ -92,6 +92,8 @@ struct binding char *dirname; }; +extern int _nl_msg_cat_cntr; + struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname, char *__locale, const char *__domainname)) diff --git a/intl/libintl.h b/intl/libintl.h index 0c987e7d73..10c3726b7c 100644 --- a/intl/libintl.h +++ b/intl/libintl.h @@ -82,34 +82,7 @@ extern char *bindtextdomain (__const char *__domainname, # define dgettext(domainname, msgid) \ dcgettext (domainname, msgid, LC_MESSAGES) -# if __GLIBC__ >= 2 && __GNUC_PREREQ (2,7) -/* Variable defined in loadmsgcat.c which gets incremented every time a - new catalog is loaded. */ -extern int _nl_msg_cat_cntr; - -# define dcgettext(domainname, msgid, category) \ - (__extension__ \ - ({ \ - char *__result; \ - if (__builtin_constant_p (msgid)) \ - { \ - static char *__translation__; \ - static int __catalog_counter__; \ - if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr) \ - { \ - __translation__ = \ - __dcgettext ((domainname), (msgid), (category)); \ - __catalog_counter__ = _nl_msg_cat_cntr; \ - } \ - __result = __translation__; \ - } \ - else \ - __result = __dcgettext ((domainname), (msgid), (category)); \ - __result; \ - })) -# endif -#endif /* Optimizing. */ - +#endif /* Optimizing. */ __END_DECLS |