diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-24 16:07:52 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-24 16:07:52 +0000 |
| commit | c126c95c719cfa564c0750a64f877a5ac02ae905 (patch) | |
| tree | af29cd47ec2839f435c4d6e7d516b2d03e1d4f63 /encoding.c | |
| parent | 78e41febfabeaf2360d7a9d0fd2390d6f3a032a7 (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.
--
* 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23843 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) { |