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 --- encoding.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'encoding.c') 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) { -- cgit