mirror/gettext
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/gettext.git synced 2026-01-26 15:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

intl: Fix name resolution failures on kLIBC

Browse Source 
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
This commit is contained in:
KO Myung-Hun 2015-11-08 14:58:00 +09:00 committed by Daiki Ueno
parent 6f2223058e
commit 660d9c6bc5
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gettext-runtime/intl/dcigettext.c
View File

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

3
gettext-runtime/intl/gettextP.h
View File

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