summaryrefslogtreecommitdiff
path: root/ruby.c
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-13 02:51:15 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-13 02:51:15 +0000
commit513d0ca7f6c7c27c8f875a84d5b9a8f3692dbe8f (patch)
treef99cd5fe9882653052b9e2e90fede5366c0a28b4 /ruby.c
parent00fb802284de17da913506377f4a346210baa4a6 (diff)
* encoding.c (ENCINDEX_EUC_JP, ENCINDEX_SJIS): removed.
(rb_enc_init): EUC-JP and Shift_JIS are not builtin now. * enc/Makefile.in: ditto. * common.mk: ditto. * ruby.c (proc_options): ditto. * enc/shift_jis.c, enc/euc_jp.c: fixes for romove from builtin. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15016 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ruby.c')
-rw-r--r--ruby.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ruby.c b/ruby.c
index 5bb0065fec..66685a27f9 100644
--- a/ruby.c
+++ b/ruby.c
@@ -709,11 +709,11 @@ proc_options(int argc, char **argv, struct cmdline_options *opt)
rb_encoding *enc = 0;
switch (*s) {
case 'E': case 'e':
- enc = ONIG_ENCODING_EUC_JP;
+ enc = enc = rb_enc_find("EUC-JP");
break;
case 'S': case 's':
enc = rb_enc_find("Windows-31J");
- if (!enc) enc = ONIG_ENCODING_SJIS;
+ if (!enc) enc = rb_enc_find("Shift_JIS");
break;
case 'U': case 'u':
enc = ONIG_ENCODING_UTF8;