summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--enc/prelude.rb2
-rw-r--r--ruby.c2
3 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e35c11a11b..5b34b58a22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Mon Jun 22 14:35:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+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.
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
diff --git a/ruby.c b/ruby.c
index e75f2f46c0..76f5125b07 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1302,7 +1302,7 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
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();