From: KO Myung-Hun <komh78@gmail.com>
Date: Sun, 8 Nov 2015 05:58:00 +0000 (+0900)
Subject: intl: Fix name resolution failures on kLIBC
X-Git-Tag: v0.19.7~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=660d9c6bc56624bc6ecd63555009fd1de36d2269;p=thirdparty%2Fgettext.git

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
---

diff --git a/gettext-runtime/intl/dcigettext.c b/gettext-runtime/intl/dcigettext.c
index 8a3f09149..c0faf1866 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 bbd213988..f3a9ded82 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;