From 1f233501941fac4c546f6ab0a1945d2eeb56df43 Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 3 Jul 2012 03:10:02 +0000 Subject: * ext/dl/cfunc.c (rb_dlcfunc_call): also needed the workaround for VC8 for x64. [ruby-dev:45875] [Bug #6676] reported by aves_ramphastos (Seigo Ishigane) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36281 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ ext/dl/cfunc.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1c384096ea..3ec4525521 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Jul 3 12:05:51 2012 NAKAMURA Usaku + + * ext/dl/cfunc.c (rb_dlcfunc_call): also needed the workaround for VC8 + for x64. [ruby-dev:45875] [Bug #6676] + reported by aves_ramphastos (Seigo Ishigane) + Tue Jul 3 11:56:46 2012 Eric Hodel * ext/zlib/zlib.c (zstream_detach_buffer): Refactored tainting of diff --git a/ext/dl/cfunc.c b/ext/dl/cfunc.c index de05eb37d7..2a96b30bed 100644 --- a/ext/dl/cfunc.c +++ b/ext/dl/cfunc.c @@ -325,7 +325,7 @@ rb_dlcfunc_inspect(VALUE self) } -#if defined(_MSC_VER) && defined(_M_AMD64) && _MSC_VER == 1500 +#if defined(_MSC_VER) && defined(_M_AMD64) && _MSC_VER >= 1400 && _MSC_VER < 1600 # pragma optimize("", off) #endif /* @@ -599,7 +599,7 @@ rb_dlcfunc_call(VALUE self, VALUE ary) return result; } -#if defined(_MSC_VER) && defined(_M_AMD64) && _MSC_VER == 1500 +#if defined(_MSC_VER) && defined(_M_AMD64) && _MSC_VER >= 1400 && _MSC_VER < 1600 # pragma optimize("", on) #endif -- cgit v1.2.3