summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-03-19 07:43:56 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-03-19 07:43:56 +0000
commit9cbc8abb7fe097b43feff64a42856521f6b418bc (patch)
treebe772bbf28ca9a75a8dcbb14f76f7ad9566c6c6a
parent66686f5775c550b28cf6ec0ec971971edbf6d348 (diff)
* merge -c 12080
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@12097 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--ext/dl/dl.c2
-rw-r--r--version.h8
3 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index c33c7c386b2..37775255351 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Mar 16 21:48:11 2007 Akinori MUSHA <knu@iDaemons.org>
+
+ * ext/dl/dl.c (rb_ary2cary): Fix a bug in type validation;
+ submitted by sheepman <sheepman AT sheepman.sakura.ne.jp>
+ in [ruby-dev:30554].
+
Fri Mar 16 18:28:06 2007 Akinori MUSHA <knu@iDaemons.org>
* ext/etc/etc.c (etc_getgrgid): Fix a bug in Etc::getgrgid()
diff --git a/ext/dl/dl.c b/ext/dl/dl.c
index 042afd31595..71c353bda3e 100644
--- a/ext/dl/dl.c
+++ b/ext/dl/dl.c
@@ -459,7 +459,7 @@ rb_ary2cary(char t, VALUE v, long *size)
VALUE val0;
val0 = rb_check_array_type(v);
- if(NIL_P(TYPE(val0))) {
+ if(NIL_P(val0)) {
rb_raise(rb_eDLTypeError, "an array is expected.");
}
v = val0;
diff --git a/version.h b/version.h
index e3edfb6e750..a2ebd089237 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.5"
-#define RUBY_RELEASE_DATE "2007-03-16"
+#define RUBY_RELEASE_DATE "2007-03-19"
#define RUBY_VERSION_CODE 185
-#define RUBY_RELEASE_CODE 20070316
-#define RUBY_PATCHLEVEL 38
+#define RUBY_RELEASE_CODE 20070319
+#define RUBY_PATCHLEVEL 39
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 5
#define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 16
+#define RUBY_RELEASE_DAY 19
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];