From 8123cc1d6bc440a2af0790d0dc9eb174d847f3e5 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Mon, 19 Mar 2007 07:43:56 +0000 Subject: * merge -c 12080 git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@12097 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ ext/dl/dl.c | 2 +- version.h | 8 ++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 69d82db0e..4334805ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Mar 16 21:48:11 2007 Akinori MUSHA + + * ext/dl/dl.c (rb_ary2cary): Fix a bug in type validation; + submitted by sheepman + in [ruby-dev:30554]. + Fri Mar 16 18:28:06 2007 Akinori MUSHA * 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 df8089e5a..5ba3646ea 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 432a0e061..08481717a 100644 --- a/version.h +++ b/version.h @@ -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[]; -- cgit