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 --- ChangeLog | 7 +++++++ encoding.c | 4 ++-- ruby.c | 2 +- version.h | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0fc5fc0b5..745f7a681 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Jun 23 01:17:38 2009 Tanaka Akira + + * 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 * ruby.c (process_options), enc/prelude.rb: encdb and transdb are diff --git a/encoding.c b/encoding.c index bde6b5d92..b8ad8016d 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) { 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(); diff --git a/version.h b/version.h index 9941b3721..698d1ebd6 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit