From 34ffc19c66e9c0fc1e8a8c70fab552090bb21df4 Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 31 Oct 2009 13:04:57 +0000 Subject: merges r22718 from trunk into ruby_1_9_1. -- * ext/dl/lib/dl/value.rb (DL::ValueUtil#wrap_arg): NULL for nil. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25592 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ ext/dl/lib/dl/value.rb | 2 ++ version.h | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0894933c36..0f5a3e3dd7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Mar 3 15:05:19 2009 Nobuyoshi Nakada + + * ext/dl/lib/dl/value.rb (DL::ValueUtil#wrap_arg): NULL for nil. + Tue Sep 8 08:32:30 2009 Nobuyoshi Nakada * test/dl/test_{cfunc,ptr}.rb: added tests from Aaron Patterson. diff --git a/ext/dl/lib/dl/value.rb b/ext/dl/lib/dl/value.rb index 254e1921ce..56dfcefa32 100644 --- a/ext/dl/lib/dl/value.rb +++ b/ext/dl/lib/dl/value.rb @@ -48,6 +48,8 @@ module DL def wrap_arg(arg, ty, funcs, &block) funcs ||= [] case arg + when nil + return 0 when CPtr return arg.to_i when IO diff --git a/version.h b/version.h index bf7d9dd8e7..ae09db154e 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 317 +#define RUBY_PATCHLEVEL 318 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit v1.2.3