From 180c8befac2cb7b9c3b9d60eba1f45de830c75ca Mon Sep 17 00:00:00 2001 From: Jonas Fonseca Date: Sat, 4 Nov 2006 08:46:45 +0100 Subject: [PATCH] Fix linker warning on Mac OS X by prefixing locale_charset with "elinks_" /usr/bin/ld: warning multiple definitions of symbol _locale_charset lib.o definition of _locale_charset in section (__TEXT,__text) /usr/lib/libiconv.dylib(localcharset.o) definition of _locale_charset --- src/intl/gettext/loadmsgcat.c | 4 ++-- src/intl/gettext/localcharset.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/intl/gettext/loadmsgcat.c b/src/intl/gettext/loadmsgcat.c index 2198d8ab..81658d8c 100644 --- a/src/intl/gettext/loadmsgcat.c +++ b/src/intl/gettext/loadmsgcat.c @@ -159,9 +159,9 @@ _nl_init_domain_conv(struct loaded_l10nfile *domain_file, else { outcharset = getenv("OUTPUT_CHARSET"); if (outcharset == NULL || outcharset[0] == '\0') { - extern const unsigned char *locale_charset(void); + extern const unsigned char *elinks_locale_charset(void); - outcharset = locale_charset(); + outcharset = elinks_locale_charset(); } } diff --git a/src/intl/gettext/localcharset.c b/src/intl/gettext/localcharset.c index 8f2a3b06..207f3364 100644 --- a/src/intl/gettext/localcharset.c +++ b/src/intl/gettext/localcharset.c @@ -193,13 +193,13 @@ get_charset_aliases(void) name. */ /* Should be in .h file, used in _nl_init_domain_conv() function. */ -const unsigned char *locale_charset(void); +const unsigned char *elinks_locale_charset(void); #ifdef STATIC STATIC #endif const unsigned char * -locale_charset(void) +elinks_locale_charset(void) { const unsigned char *codeset; const unsigned char *aliases;