From 54e0fc500ccb38df2b4083efb49d59fd3f03cd8d Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 24 Jun 2009 16:07:52 +0000 Subject: merges r23813 and r23821 from trunk into ruby_1_9_1. -- * ruby.c (process_options), enc/prelude.rb: encdb and transdb are extension libraries. -- * ruby.c (process_options): don't specify .so for encdb here. "." is replaced by "_" in load_encoding. * encoding.c (load_encoding): add .so here. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23843 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ruby.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ruby.c') diff --git a/ruby.c b/ruby.c index 61bf54f78..c6cfdf7e1 100644 --- a/ruby.c +++ b/ruby.c @@ -1274,7 +1274,7 @@ process_options(VALUE arg) rb_obj_freeze(opt->script_name); ruby_init_loadpath_safe(opt->safe_level); - rb_enc_find_index("encdb.so"); + rb_enc_find_index("encdb"); lenc = rb_locale_encoding(); rb_enc_associate(rb_progname, lenc); parser = rb_parser_new(); -- cgit