yugui	2009-10-31 22:04:57 +0900 (Sat, 31 Oct 2009)

  New Revision: 25592

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25592

  Log:
    merges r22718 from trunk into ruby_1_9_1.
    --
    * ext/dl/lib/dl/value.rb (DL::ValueUtil#wrap_arg): NULL for nil.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/ext/dl/lib/dl/value.rb
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 25591)
+++ ruby_1_9_1/ChangeLog	(revision 25592)
@@ -1,3 +1,7 @@
+Tue Mar  3 15:05:19 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/dl/lib/dl/value.rb (DL::ValueUtil#wrap_arg): NULL for nil.
+
 Tue Sep  8 08:32:30 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* test/dl/test_{cfunc,ptr}.rb: added tests from Aaron Patterson.
Index: ruby_1_9_1/ext/dl/lib/dl/value.rb
===================================================================
--- ruby_1_9_1/ext/dl/lib/dl/value.rb	(revision 25591)
+++ ruby_1_9_1/ext/dl/lib/dl/value.rb	(revision 25592)
@@ -48,6 +48,8 @@
     def wrap_arg(arg, ty, funcs, &block)
         funcs ||= []
         case arg
+        when nil
+          return 0
         when CPtr
           return arg.to_i
         when IO
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 25591)
+++ ruby_1_9_1/version.h	(revision 25592)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/