diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | encoding.c | 4 | ||||
| -rw-r--r-- | ruby.c | 2 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,10 @@ +Tue Jun 23 01:17:38 2009 Tanaka Akira <akr@fsij.org> + + * ruby.c (process_options): don't specify .so for encdb here. + "." is replaced by "_" in load_encoding. + + * encoding.c (load_encoding): add .so here. + Mon Jun 22 14:41:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * ruby.c (process_options), enc/prelude.rb: encdb and transdb are diff --git a/encoding.c b/encoding.c index bde6b5d929..b8ad8016de 100644 --- a/encoding.c +++ b/encoding.c @@ -456,11 +456,11 @@ require_enc(VALUE enclib) static int load_encoding(const char *name) { - VALUE enclib = rb_sprintf("enc/%s", name); + VALUE enclib = rb_sprintf("enc/%s.so", name); VALUE verbose = ruby_verbose; VALUE debug = ruby_debug; VALUE loaded; - char *s = RSTRING_PTR(enclib) + 4, *e = RSTRING_END(enclib); + char *s = RSTRING_PTR(enclib) + 4, *e = RSTRING_END(enclib) - 3; int idx; while (s < e) { @@ -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(); @@ -1,6 +1,6 @@ #define RUBY_VERSION "1.9.1" #define RUBY_RELEASE_DATE "2009-06-25" -#define RUBY_PATCHLEVEL 200 +#define RUBY_PATCHLEVEL 201 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |