diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-04 10:36:28 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-04 10:36:28 +0000 |
| commit | 24d1ff57c737995e85873852235786bfaa8c1f02 (patch) | |
| tree | 490a05ba9ae26c5068093c26d680b09431909586 | |
| parent | dfbbe2ef6b0abdd7ba3577dea5f44220d70b59c3 (diff) | |
merge revision(s) 36281:
* 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/branches/ruby_1_9_3@36307 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, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Wed Jul 4 19:36:17 2012 NAKAMURA Usaku <usa@ruby-lang.org> + + * 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 19:37:52 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * file.c (rmext): no extension to strip if empty string. diff --git a/ext/dl/cfunc.c b/ext/dl/cfunc.c index 66aebf2e79..61a3aaebca 100644 --- a/ext/dl/cfunc.c +++ b/ext/dl/cfunc.c @@ -324,7 +324,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 /* @@ -594,7 +594,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 @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 252 +#define RUBY_PATCHLEVEL 253 #define RUBY_RELEASE_DATE "2012-07-04" #define RUBY_RELEASE_YEAR 2012 |