summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-05-22 14:19:10 (GMT)
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-05-22 14:19:10 (GMT)
commitd7e7d1d5c71f211002d1dc126db29b192af7d1c3 (patch)
tree1340537f8f716541b58202242df3bff8be5e8117
parent41cbc02232a8452f980045c4280e8fbe3e3e00cc (diff)
merge -c 12123
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@12308 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--eval.c3
-rw-r--r--version.h2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b2d2aab..cbdb5fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 22 23:14:19 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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 <nobu@ruby-lang.org>
* bignum.c (rb_big2str0): round up for the most significant digit.
diff --git a/eval.c b/eval.c
index 014f3f7..bc657c1 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 3071af0..b4c636d 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