aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2010-02-10 10:44:21 +0000
committerCorinna Vinschen <corinna@vinschen.de>2010-02-10 10:44:21 +0000
commitae40237a0a3fd8b4c001065c5f7ae5b749d9a3fa (patch)
tree60992c485fa0b6c921a96f2d13b849688404067a
parent3700578ee8a4d7f56184a8a742067a2bdcb71360 (diff)
downloadnewlib-ae40237a0a3fd8b4c001065c5f7ae5b749d9a3fa.zip
newlib-ae40237a0a3fd8b4c001065c5f7ae5b749d9a3fa.tar.gz
newlib-ae40237a0a3fd8b4c001065c5f7ae5b749d9a3fa.tar.bz2
* nlsfuncs.cc (__get_lcid_from_locale): Convert iu_CA to iu-Latn-CA
rather than iu-Cans-CA on Vista and later. (__set_charset_from_locale): Set default charset for iu_CA to UTF-8.
-rw-r--r--winsup/cygwin/ChangeLog15
-rw-r--r--winsup/cygwin/nlsfuncs.cc5
2 files changed, 18 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 72aff2e..dbede5c 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-10 Corinna Vinschen <corinna@vinschen.de>
+
+ * nlsfuncs.cc (__get_lcid_from_locale): Convert iu_CA to iu-Latn-CA
+ rather than iu-Cans-CA on Vista and later.
+ (__set_charset_from_locale): Set default charset for iu_CA to UTF-8.
+
2010-02-10 Christopher Faylor <me+cygwin@cgf.cx>
* dcrt0.cc (_dll_crt0): Set _main_tls as early as possible.
@@ -39,6 +45,15 @@
2010-02-09 Corinna Vinschen <corinna@vinschen.de>
+ * nlsfuncs.cc (lc_wcstombs): Add `return_invalid' flag to specify
+ whether invalid chars should be ignored or not. Change comment.
+ (__set_lc_monetary_from_win): Call lc_wcstombs with return_invalid
+ flag set.
+ (__set_lc_messages_from_win): Simplify to accommodate the fact that
+ lc_wcstombs just ignores invalid chars. Explain why.
+
+2010-02-09 Corinna Vinschen <corinna@vinschen.de>
+
* nlsfuncs.cc (__set_lc_messages_from_win): Fix typo.
2010-02-09 Corinna Vinschen <corinna@vinschen.de>
diff --git a/winsup/cygwin/nlsfuncs.cc b/winsup/cygwin/nlsfuncs.cc
index d7bf0ea..c351c9d 100644
--- a/winsup/cygwin/nlsfuncs.cc
+++ b/winsup/cygwin/nlsfuncs.cc
@@ -101,7 +101,7 @@ __get_lcid_from_locale (const char *name)
{ "az-AZ" , L"az-Latn-AZ" },
{ "bs-BA" , L"bs-Latn-BA" },
{ "ha-NG" , L"ha-Latn-NG" },
- { "iu-CA" , L"iu-Cans-CA" },
+ { "iu-CA" , L"iu-Latn-CA" },
{ "mn-CN" , L"mn-Mong-CN" },
{ "no-NO" , L"nb-NO" },
{ "sr-BA" , L"sr-Cyrl-BA" },
@@ -961,7 +961,8 @@ __set_charset_from_locale (const char *locale, char *charset)
|| lcid == 0x043b /* se_NO (Northern Saami/Norway) */
|| lcid == 0x0432 /* tn_ZA (Tswana/South Africa) */
|| lcid == 0x0488 /* wo_SN (Wolof/Senegal) */
- || lcid == 0x046a) /* yo_NG (Yoruba/Nigeria) */
+ || lcid == 0x046a /* yo_NG (Yoruba/Nigeria) */
+ || lcid == 0x085d) /* iu_CA (Inuktitut/Canada) */
cs = "UTF-8";
else if (lcid == 0x042e) /* hsb_DE (Upper Sorbian/Germany) */
cs = "ISO-8859-2";