1
0
Fork 0

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
This commit is contained in:
Jonas Fonseca 2006-11-04 08:46:45 +01:00
parent eb2c64633c
commit 180c8befac
2 changed files with 4 additions and 4 deletions

View File

@ -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();
}
}

View File

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