diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-19 07:43:56 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-19 07:43:56 +0000 |
commit | 02edb1e4abc067c60bf1e34846ecc527e98b3876 (patch) | |
tree | 168e80452cab21c3377fb52e373619638980dd86 | |
parent | 9da79c24a5b1e9717073f97450af417e71a665ba (diff) |
* merge -c 12080
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@12097 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ext/dl/dl.c | 2 | ||||
-rw-r--r-- | version.h | 8 |
3 files changed, 11 insertions, 5 deletions
@@ -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 df8089e5aa..5ba3646ea3 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; @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2007-03-16" +#define RUBY_RELEASE_DATE "2007-03-19" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20070316 -#define RUBY_PATCHLEVEL 3 +#define RUBY_RELEASE_CODE 20070319 +#define RUBY_PATCHLEVEL 4 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 6 #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[]; |