From 01865d5bc61b5d00e261ff2a0956f50311f454b5 Mon Sep 17 00:00:00 2001 From: naruse Date: Fri, 21 Sep 2012 10:53:50 +0000 Subject: 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@gmail.com (ray linn) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37007 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ ext/dl/cfunc.c | 4 ++++ version.h | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a2e7f43bf2..7c076fb9d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Sep 21 19:53:38 2012 NAKAMURA Usaku + + * 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@gmail.com (ray linn) + Fri Sep 21 18:45:20 2012 Luis Lavena * include/ruby/win32.h: undef stat to silence mingw-w64 stat diff --git a/ext/dl/cfunc.c b/ext/dl/cfunc.c index 61a3aaebca..8edf102210 100644 --- a/ext/dl/cfunc.c +++ b/ext/dl/cfunc.c @@ -366,7 +366,11 @@ rb_dlcfunc_call(VALUE self, VALUE ary) 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); diff --git a/version.h b/version.h index 029c4bdd24..959598948c 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit v1.2.3