Welcome to mirror list, hosted at ThFree Co, Russian Federation.

cygwin.com/git/newlib-cygwin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2009-03-26 13:24:38 +0300
committerCorinna Vinschen <corinna@vinschen.de>2009-03-26 13:24:38 +0300
commite916d8ec8647e988ed5e0d9cb0e7f3a66100456b (patch)
treef1a9b639811fbabbe6756fb406521abcf56737bd /newlib/libc/locale/locale.c
parentf6e29e076a1e0662faff14e7fe23235f4a834ff6 (diff)
* libc/locale/locale.c (loadlocale): Revert to charset "GBK" instead
of "GB2312". Fix documentation accordingly.
Diffstat (limited to 'newlib/libc/locale/locale.c')
-rw-r--r--newlib/libc/locale/locale.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/newlib/libc/locale/locale.c b/newlib/libc/locale/locale.c
index 7dfa04ada..24d285bf7 100644
--- a/newlib/libc/locale/locale.c
+++ b/newlib/libc/locale/locale.c
@@ -59,7 +59,7 @@ are <<"UTF-8">>, <<"JIS">>, <<"EUCJP">>/<<"eucJP">>, <<"SJIS">>,
corresponding LC_* environment variables and $LANG according to POSIX rules.
Under Cygwin, this implementation additionally supports the charsets
-<<"GB2312">>, <<"eucKR">>, and <<"Big5">>.
+<<"GBK">>, <<"eucKR">>, and <<"Big5">>.
If you use <<NULL>> as the <[locale]> argument, <<setlocale>> returns
a pointer to the string representing the current locale (always
@@ -575,7 +575,7 @@ loadlocale(struct _reent *p, int category)
break;
#ifdef __CYGWIN__
case 'G':
- if (strcmp (charset, "GB2312"))
+ if (strcmp (charset, "GBK"))
return NULL;
mbc_max = 2;
#ifdef _MB_CAPABLE