summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-29 04:26:30 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-29 04:26:30 +0000
commitfe15b86b9d75a679f68042d1c432fcd64c47c73a (patch)
tree5a375a64cdb537d0e153c2b6bc91784d9dd4f36e
parenta2b03f10dc1726c8109e4fc5a2fc45e0dcf3d368 (diff)
* enc/gbk.c: add GBK, CP936 and CP949.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15308 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--enc/euc_cn.c1
-rw-r--r--enc/gb18030.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/enc/euc_cn.c b/enc/euc_cn.c
index b6494f91ac..c30f4aa847 100644
--- a/enc/euc_cn.c
+++ b/enc/euc_cn.c
@@ -9,3 +9,4 @@ Init_euc_cn(void)
}
ENC_ALIAS("eucCN", "EUC-CN");
+ENC_ALIAS("GB2312", "EUC-CN");
diff --git a/enc/gb18030.c b/enc/gb18030.c
index 1d48ef23d6..65666ec3af 100644
--- a/enc/gb18030.c
+++ b/enc/gb18030.c
@@ -493,6 +493,4 @@ OnigEncodingDefine(gb18030, GB18030) = {
gb18030_left_adjust_char_head,
gb18030_is_allowed_reverse_match
};
-ENC_REPLICATE("GBK", "GB18030");
-ENC_REPLICATE("CP936", "GB18030");
-ENC_ALIAS("Windows-936", "GBK");
+