summaryrefslogtreecommitdiff
path: root/numeric.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-31 00:13:30 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-31 00:13:30 +0000
commit031d624b3817d54d06674d8019e0d5f79e1485df (patch)
tree1f6d8dfa695cda69eba9da638a13f22c745064af /numeric.c
parenta6cafde27804d0a935212ca8921408ebc35861a6 (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 'numeric.c')
-rw-r--r--numeric.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/numeric.c b/numeric.c
index 203bef9c65..40629f56b6 100644
--- a/numeric.c
+++ b/numeric.c
@@ -2322,7 +2322,7 @@ fix_mul(VALUE x, VALUE y)
#if SIZEOF_LONG * 2 <= SIZEOF_LONG_LONG
LONG_LONG d;
#else
- long c;
+ volatile long c;
VALUE r;
#endif