diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-09-21 10:53:50 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-09-21 10:53:50 +0000 |
commit | 01865d5bc61b5d00e261ff2a0956f50311f454b5 (patch) | |
tree | 7d41321e94602fa14d4d4207ef502e087bf00e03 | |
parent | a0a7608bb28f9dc46c6e22a0f505e5f1bd61d1fe (diff) |
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
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ext/dl/cfunc.c | 4 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Fri Sep 21 19:53:38 2012 NAKAMURA Usaku <usa@ruby-lang.org> + + * 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 <luislavena@gmail.com> * 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); @@ -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 |