diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-31 00:13:30 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-31 00:13:30 +0000 |
commit | 031d624b3817d54d06674d8019e0d5f79e1485df (patch) | |
tree | 1f6d8dfa695cda69eba9da638a13f22c745064af /rational.c | |
parent | a6cafde27804d0a935212ca8921408ebc35861a6 (diff) |
merges r31822 and r31823 from trunk into ruby_1_9_2.
--
* insns.def (opt_mult): as r31805, volatile it.
Without this, clang -O fails calculation.
* numeric.c (fix_mul): ditto.
* rational.c (f_imul): ditto.
--
Fix mixed declarations in r31822.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31844 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'rational.c')
-rw-r--r-- | rational.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rational.c b/rational.c index bd43a3617c..83ef5bf088 100644 --- a/rational.c +++ b/rational.c @@ -588,7 +588,7 @@ inline static VALUE f_imul(long a, long b) { VALUE r; - long c; + volatile long c; if (a == 0 || b == 0) return ZERO; |