From 72c7fc35d49a4041da22c04ca066fa4a47a46683 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 13 Jan 2008 02:51:15 +0000
Subject: * 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: http://svn.ruby-lang.org/repos/ruby/trunk@15016 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ruby.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ruby.c')

diff --git a/ruby.c b/ruby.c
index 5bb0065fe..66685a27f 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;
-- 
cgit