From 1e2a324000874db35ea5d98af2cd26a30636c7d9 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 5 Jan 2009 08:59:46 +0000 Subject: * missing/langinfo.c (nl_langinfo_0): fixed typos for SJIS. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21344 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 +++- missing/langinfo.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 03f14a46c..857547760 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Mon Jan 5 17:51:40 2009 Nobuyoshi Nakada +Mon Jan 5 17:59:43 2009 Nobuyoshi Nakada * configure.in (cygwin): needs properly implemented nl_langinfo(). [ruby-core:21110] @@ -6,6 +6,8 @@ Mon Jan 5 17:51:40 2009 Nobuyoshi Nakada * 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 * encoding.c (rb_locale_charmap): use GetConsoleCP() instead of diff --git a/missing/langinfo.c b/missing/langinfo.c index 50e1d9bea..29f82e3ed 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"; } -- cgit