aboutsummaryrefslogtreecommitdiff
path: root/intl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-12-24 05:42:34 +0000
committerUlrich Drepper <drepper@redhat.com>1999-12-24 05:42:34 +0000
commit575b273bdc8b2fe0be70396486e9fbc400b2e641 (patch)
tree6df0b1bb75edc18a3786b5f7fe470ac7bce3ea73 /intl
parent46fd4f671c45b70909e03160aa4568db5f6c8556 (diff)
downloadglibc-575b273bdc8b2fe0be70396486e9fbc400b2e641.zip
glibc-575b273bdc8b2fe0be70396486e9fbc400b2e641.tar.gz
glibc-575b273bdc8b2fe0be70396486e9fbc400b2e641.tar.bz2
Update.
1999-12-23 Ulrich Drepper <drepper@cygnus.com> * locale/en_BW: New file. * locale/en_ZW: New file. Contributed by Schalk W. Cronjé <schalkc@ntaba.co.za>. Contributed by Schalk W. Cronjé <schalkc@ntaba.co.za>.
Diffstat (limited to 'intl')
-rw-r--r--intl/gettextP.h2
-rw-r--r--intl/libintl.h29
2 files changed, 3 insertions, 28 deletions
diff --git a/intl/gettextP.h b/intl/gettextP.h
index 1b4dcb3..b3c8c18 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 0c987e7..10c3726 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