summaryrefslogtreecommitdiffstats
path: root/gettext-runtime
diff options
context:
space:
mode:
authorKO Myung-Hun <komh78@gmail.com>2015-11-08 14:58:00 +0900
committerDaiki Ueno <ueno@gnu.org>2015-12-10 12:45:20 +0900
commit660d9c6bc56624bc6ecd63555009fd1de36d2269 (patch)
tree011794f8dfeb0200c20584564a842c6d3f6a0aa3 /gettext-runtime
parent6f2223058e136a9396b9b53eb094897a398b7fa6 (diff)
downloadexternal_gettext-660d9c6bc56624bc6ecd63555009fd1de36d2269.zip
external_gettext-660d9c6bc56624bc6ecd63555009fd1de36d2269.tar.gz
external_gettext-660d9c6bc56624bc6ecd63555009fd1de36d2269.tar.bz2
intl: Fix name resolution failures on kLIBC
kLIBC already has _nl_default_dirname and _nl_msg_cat_cntr in its own gettext implmenetation. * gettext-runtime/intl/dcigettext.c: Do not declare _nl_default_dirname on kLIBC. * gettext-runtime/intl/gettextP.h: Define _nl_msg_cat_cntr to libintl_nl_msg_cat_cntr on kLIBC. Copyright-paperwork-exempt: yes
Diffstat (limited to 'gettext-runtime')
-rw-r--r--gettext-runtime/intl/dcigettext.c2
-rw-r--r--gettext-runtime/intl/gettextP.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/gettext-runtime/intl/dcigettext.c b/gettext-runtime/intl/dcigettext.c
index 8a3f091..c0faf18 100644
--- a/gettext-runtime/intl/dcigettext.c
+++ b/gettext-runtime/intl/dcigettext.c
@@ -323,7 +323,7 @@ const char *_nl_current_default_domain attribute_hidden
#endif
/* Contains the default location of the message catalogs. */
-#if defined __EMX__
+#if defined __EMX__ && !defined __KLIBC__
extern const char _nl_default_dirname[];
#else
# ifdef _LIBC
diff --git a/gettext-runtime/intl/gettextP.h b/gettext-runtime/intl/gettextP.h
index bbd2139..f3a9ded 100644
--- a/gettext-runtime/intl/gettextP.h
+++ b/gettext-runtime/intl/gettextP.h
@@ -219,6 +219,9 @@ struct binding
/* A counter which is incremented each time some previous translations
become invalid.
This variable is part of the external ABI of the GNU libintl. */
+#if defined __KLIBC__ && !defined _LIBC
+# define _nl_msg_cat_cntr libintl_nl_msg_cat_cntr
+#endif
#ifdef IN_LIBGLOCALE
# include <glocale/config.h>
extern LIBGLOCALE_DLL_EXPORTED int _nl_msg_cat_cntr;