diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-24 16:03:32 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-24 16:03:32 +0000 |
commit | eed1694c577e5a9ccb48cdf2f00c4e7d1a17df8f (patch) | |
tree | 0845620d605182fc67a13457fed18c4ffc9f5ca5 | |
parent | d990d38aac9e12795458528b287c05f0e1fcabd5 (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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23841 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | enc/prelude.rb | 2 | ||||
-rw-r--r-- | ruby.c | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Mon Jun 22 14:41:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ruby.c (process_options), enc/prelude.rb: encdb and transdb are + extension libraries. + + * ruby.c (process_options): set progname earlier. + Sun Jun 21 22:33:05 2009 Yusuke Endoh <mame@tsg.ne.jp> * load.c (Init_load): $: must be readonly. [ruby-dev:38690] diff --git a/enc/prelude.rb b/enc/prelude.rb index a5c78b7e64..8ce59f957a 100644 --- a/enc/prelude.rb +++ b/enc/prelude.rb @@ -1,4 +1,4 @@ -%w'enc/encdb enc/trans/transdb'.each do |init| +%w'enc/encdb.so enc/trans/transdb.so'.each do |init| begin require(init) rescue LoadError @@ -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"); + rb_enc_find_index("encdb.so"); lenc = rb_locale_encoding(); rb_enc_associate(rb_progname, lenc); parser = rb_parser_new(); |