From: corinna <corinna>
Date: Wed, 25 Mar 2009 09:00:02 +0000 (+0000)
Subject: 	* libc/locale/locale.c (loadlocale): Rename charset "GBK" to
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ad9391e98032b61c497953d3d5a78ded0abdc1ca;p=pf3gnuchains%2Fpf3gnuchains3x.git

	* libc/locale/locale.c (loadlocale): Rename charset "GBK" to
	"GB2312".  Fix documentation accordingly.
---

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 032d39649a..1f46cd2838 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-25  Corinna Vinschen  <corinna@vinschen.de>
+
+	* libc/locale/locale.c (loadlocale): Rename charset "GBK" to
+	"GB2312".  Fix documentation accordingly.
+
 2009-03-24  Corinna Vinschen  <corinna@vinschen.de>
 
 	* libc/locale/locale.c (loadlocale): Rename charset "CP949" to
diff --git a/newlib/libc/locale/locale.c b/newlib/libc/locale/locale.c
index 0bf004d9ae..26379bef70 100644
--- a/newlib/libc/locale/locale.c
+++ b/newlib/libc/locale/locale.c
@@ -58,8 +58,8 @@ are <<"UTF-8">>, <<"JIS">>, <<"EUCJP">>/<<"eucJP">>, <<"SJIS">>,
 (<<"">> is also accepted; if given, the settings are read from the
 corresponding LC_* environment variables and $LANG according to POSIX rules.
 
-Under Cygwin, this implementation additionally supports the charsets <<"GBK">>,
-<<"eucKR">>, and <<"Big5">>.
+Under Cygwin, this implementation additionally supports the charsets
+<<"GB2312">>, <<"eucKR">>, and <<"Big5">>.
 
 If you use <<NULL>> as the <[locale]> argument, <<setlocale>> returns
 a pointer to the string representing the current locale (always
@@ -572,7 +572,7 @@ loadlocale(struct _reent *p, int category)
       break;
 #ifdef __CYGWIN__
     case 'G':
-      if (strcmp (charset, "GBK"))
+      if (strcmp (charset, "GB2312"))
       	return NULL;
       mbc_max = 2;
 #ifdef _MB_CAPABLE