From 08871bb9195f30e9b191e555df68c069a5f8d4dd Mon Sep 17 00:00:00 2001 From: shyouhei Date: Tue, 22 May 2007 14:19:10 +0000 Subject: merge -c 12123 git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@12308 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ eval.c | 3 ++- version.h | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b2d2aabb3..cbdb5fad0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue May 22 23:14:19 2007 Nobuyoshi Nakada + + * eval.c (rb_provided): check for extension library if SOEXT is + explicitly given. [ruby-dev:30657] + Tue May 22 21:29:08 2007 Nobuyoshi Nakada * bignum.c (rb_big2str0): round up for the most significant digit. diff --git a/eval.c b/eval.c index 014f3f73a..bc657c186 100644 --- a/eval.c +++ b/eval.c @@ -7017,7 +7017,8 @@ rb_provided(feature) return Qfalse; } else if (IS_SOEXT(ext) || IS_DLEXT(ext)) { - return Qfalse; /* may be overriden by .rb file */ + if (rb_feature_p(feature, ext, Qfalse)) return Qtrue; + return Qfalse; } } if (rb_feature_p(feature, feature + strlen(feature), Qtrue)) diff --git a/version.h b/version.h index 3071af0e9..b4c636ddd 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2007-05-22" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20070522 -#define RUBY_PATCHLEVEL 6 +#define RUBY_PATCHLEVEL 7 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit