aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-11-02 08:57:19 -04:00
Code

Fix linker warning on Mac OS X by prefixing locale_charset with "elinks_"

Browse Source 
/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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/intl/gettext/loadmsgcat.c
View File

@ -159,9 +159,9 @@ _nl_init_domain_conv(struct loaded_l10nfile *domain_file,
else { else {
outcharset = getenv("OUTPUT_CHARSET"); outcharset = getenv("OUTPUT_CHARSET");
if (outcharset == NULL || outcharset[0] == '\0') { 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();
} }
} }

4
src/intl/gettext/localcharset.c
View File

@ -193,13 +193,13 @@ get_charset_aliases(void)
name. */ name. */
/* Should be in .h file, used in _nl_init_domain_conv() function. */ /* 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 #ifdef STATIC
STATIC STATIC
#endif #endif
const unsigned char * const unsigned char *
locale_charset(void) elinks_locale_charset(void)
{ {
const unsigned char *codeset; const unsigned char *codeset;
const unsigned char *aliases; const unsigned char *aliases;