naruse	2012-09-21 19:53:50 +0900 (Fri, 21 Sep 2012)

  New Revision: 37007

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

  Log:
    merge revision(s) 35485: [Backport #7013]
    
    * ext/dl/cfunc.c (rb_dlcfunc_call): should convert a Bignum value to
      unsigned long long on Win64.
      [ruby-core:44636][Bug #6364] reported by raylinn@g... (ray linn)

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/dl/cfunc.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 37006)
+++ ruby_1_9_3/ChangeLog	(revision 37007)
@@ -1,3 +1,9 @@
+Fri Sep 21 19:53:38 2012  NAKAMURA Usaku  <usa@r...>
+
+	* ext/dl/cfunc.c (rb_dlcfunc_call): should convert a Bignum value to
+	  unsigned long long on Win64.
+	  [ruby-core:44636][Bug #6364] reported by raylinn@g... (ray linn)
+
 Fri Sep 21 18:45:20 2012  Luis Lavena  <luislavena@g...>
 
 	* include/ruby/win32.h: undef stat to silence mingw-w64 stat
Index: ruby_1_9_3/ext/dl/cfunc.c
===================================================================
--- ruby_1_9_3/ext/dl/cfunc.c	(revision 37006)
+++ ruby_1_9_3/ext/dl/cfunc.c	(revision 37007)
@@ -366,7 +366,11 @@
 	    stack[i] = (DLSTACK_TYPE)FIX2LONG(arg);
 	}
 	else if (RB_TYPE_P(arg, T_BIGNUM)) {
+#if SIZEOF_VOIDP == SIZEOF_LONG
 	    stack[i] = (DLSTACK_TYPE)rb_big2ulong_pack(arg);
+#else
+	    stack[i] = (DLSTACK_TYPE)rb_big2ull(arg);
+#endif
 	}
 	else {
 	    Check_Type(arg, T_FIXNUM);
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 37006)
+++ ruby_1_9_3/version.h	(revision 37007)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 272
+#define RUBY_PATCHLEVEL 273
 
 #define RUBY_RELEASE_DATE "2012-09-21"
 #define RUBY_RELEASE_YEAR 2012

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