mirror of
https://github.com/rkd77/elinks.git
synced 2024-09-06 23:44:43 -04:00
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:
parent
eb2c64633c
commit
180c8befac
@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user