summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-25 07:51:10 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-25 07:51:10 +0000
commitebbf66b2e7a1ac964fac439f051cc48d2685e1d8 (patch)
tree6c875a0d8f7cc0944c0be038d2dd9eab9fbbbfc3
parent15d64b70512818d1f7c158532e2249cd0796fc36 (diff)
downloadruby-ebbf66b2e7a1ac964fac439f051cc48d2685e1d8.tar.gz
ruby-ebbf66b2e7a1ac964fac439f051cc48d2685e1d8.tar.xz
ruby-ebbf66b2e7a1ac964fac439f051cc48d2685e1d8.zip
* enc/trans/japanese.c (rb_{from,to}_{SHIFT_JIS,EUC_JP}): inversed
from_encoding and to_encoding. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14684 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--enc/trans/japanese.c8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 9dfa93103..596d524cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 25 16:51:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * enc/trans/japanese.c (rb_{from,to}_{SHIFT_JIS,EUC_JP}): inversed
+ from_encoding and to_encoding.
+
Tue Dec 25 16:41:57 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* golf_prelude.rb (h): add new method for all golfers.
diff --git a/enc/trans/japanese.c b/enc/trans/japanese.c
index 1b0cc30ba..3ac71882a 100644
--- a/enc/trans/japanese.c
+++ b/enc/trans/japanese.c
@@ -4424,7 +4424,7 @@ from_SHIFT_JIS = {
};
static rb_transcoder
rb_from_SHIFT_JIS = {
- "UTF-8", "SHIFT_JIS", &from_SHIFT_JIS, 3, 0,
+ "SHIFT_JIS", "UTF-8", &from_SHIFT_JIS, 3, 0,
NULL, NULL,
};
@@ -13354,7 +13354,7 @@ to_SHIFT_JIS = {
};
static rb_transcoder
rb_to_SHIFT_JIS = {
- "SHIFT_JIS", "UTF-8", &to_SHIFT_JIS, 2, 1,
+ "UTF-8", "SHIFT_JIS", &to_SHIFT_JIS, 2, 1,
NULL, NULL,
};
@@ -18128,7 +18128,7 @@ from_EUC_JP = {
};
static rb_transcoder
rb_from_EUC_JP = {
- "UTF-8", "EUC-JP", &from_EUC_JP, 3, 0,
+ "EUC-JP", "UTF-8", &from_EUC_JP, 3, 0,
NULL, NULL,
};
@@ -23633,7 +23633,7 @@ to_EUC_JP = {
};
static rb_transcoder
rb_to_EUC_JP = {
- "EUC-JP", "UTF-8", &to_EUC_JP, 2, 1,
+ "UTF-8", "EUC-JP", &to_EUC_JP, 2, 1,
NULL, NULL,
};