2009-10-23 Tristan Gingold <gingold@adacore.com>
* charset.c (_initialize_charset): Set a default value to auto_host_charset_name if empty.
This commit is contained in:
parent
52e6018d9d
commit
06be6983bb
@ -1,3 +1,8 @@
|
|||||||
|
2009-12-01 Tristan Gingold <gingold@adacore.com>
|
||||||
|
|
||||||
|
* charset.c (_initialize_charset): Set a default value to
|
||||||
|
auto_host_charset_name if empty.
|
||||||
|
|
||||||
2009-12-01 Joseph Myers <joseph@codesourcery.com>
|
2009-12-01 Joseph Myers <joseph@codesourcery.com>
|
||||||
|
|
||||||
* gcore.c: Include solib.h.
|
* gcore.c: Include solib.h.
|
||||||
|
@ -818,8 +818,9 @@ _initialize_charset (void)
|
|||||||
#ifdef HAVE_LANGINFO_CODESET
|
#ifdef HAVE_LANGINFO_CODESET
|
||||||
auto_host_charset_name = nl_langinfo (CODESET);
|
auto_host_charset_name = nl_langinfo (CODESET);
|
||||||
/* Solaris will return `646' here -- but the Solaris iconv then
|
/* Solaris will return `646' here -- but the Solaris iconv then
|
||||||
does not accept this. */
|
does not accept this. Darwin (and maybe FreeBSD) may return "" here,
|
||||||
if (!strcmp (auto_host_charset_name, "646"))
|
which GNU libiconv doesn't like (infinite loop). */
|
||||||
|
if (!strcmp (auto_host_charset_name, "646") || !*auto_host_charset_name)
|
||||||
auto_host_charset_name = "ASCII";
|
auto_host_charset_name = "ASCII";
|
||||||
target_charset_name = auto_host_charset_name;
|
target_charset_name = auto_host_charset_name;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user