* libc/locale/locale.c (loadlocale): Revert to charset "GBK" instead

of "GB2312".  Fix documentation accordingly.
This commit is contained in:
Corinna Vinschen 2009-03-26 10:24:38 +00:00
parent f6e29e076a
commit e916d8ec86
2 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2009-03-26 Corinna Vinschen <corinna@vinschen.de>
* libc/locale/locale.c (loadlocale): Revert to charset "GBK" instead
of "GB2312". Fix documentation accordingly.
2009-03-26 Corinna Vinschen <corinna@vinschen.de>
* libc/ctype/ctype_.c (_CTYPE_DATA_0_127): Mark TAB as blank character.

View File

@ -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