summaryrefslogtreecommitdiff
path: root/ruby.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-24 16:07:52 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-24 16:07:52 +0000
commitc126c95c719cfa564c0750a64f877a5ac02ae905 (patch)
treeaf29cd47ec2839f435c4d6e7d516b2d03e1d4f63 /ruby.c
parent78e41febfabeaf2360d7a9d0fd2390d6f3a032a7 (diff)
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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23843 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ruby.c')
-rw-r--r--ruby.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ruby.c b/ruby.c
index 61bf54f78b..c6cfdf7e16 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();