summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-05 08:59:46 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-05 08:59:46 +0000
commit893efc4db955c94f77049a0b339abae27327b822 (patch)
treeafb6ff95e17c91fdc069bf51e9f4f7794c45461a
parentc6827f709c07f182b1713621246dc56125ade0cf (diff)
* missing/langinfo.c (nl_langinfo_0): fixed typos for SJIS.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21344 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--missing/langinfo.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 03f14a46c9..8575477602 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Mon Jan 5 17:51:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Jan 5 17:59:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (cygwin): needs properly implemented nl_langinfo().
[ruby-core:21110]
@@ -6,6 +6,8 @@ Mon Jan 5 17:51:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* missing/langinfo.c: added as suggested at [ruby-core:21015], from
http://www.cl.cam.ac.uk/~mgk25/ucs/langinfo.c.
+ * missing/langinfo.c (nl_langinfo_0): fixed typos for SJIS.
+
Mon Jan 5 17:38:40 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* encoding.c (rb_locale_charmap): use GetConsoleCP() instead of
diff --git a/missing/langinfo.c b/missing/langinfo.c
index 50e1d9bea4..29f82e3edc 100644
--- a/missing/langinfo.c
+++ b/missing/langinfo.c
@@ -76,10 +76,10 @@ static const char *nl_langinfo_0(nl_item item)
if (strstart(p, "620")) return "TIS-620";
if (strstart(p, "2312")) return "GB2312";
if (strstart(p, "HKSCS")) return "Big5HKSCS"; /* no MIME charset */
- if (strstart(p, "Big5") || strstart(l, "BIG5")) return "Big5";
+ if (strstart(p, "BIG5")) return "Big5";
if (strstart(p, "GBK")) return "GBK"; /* no MIME charset */
if (strstart(p, "18030")) return "GB18030"; /* no MIME charset */
- if (strstart(p, "Shift_JIS") || strstart(l, "SJIS")) return "Shift_JIS";
+ if (strstart(p, "Shift_JIS") || strstart(p, "SJIS")) return "Shift_JIS";
/* check for conclusive modifier */
if (strstart(p, "euro")) return "ISO-8859-15";
}