summaryrefslogtreecommitdiff
path: root/vm_eval.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-21 14:47:27 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-21 14:47:27 +0000
commit8d5f3471b0eaba08bbb61c801fdecdc1b3115727 (patch)
treeaa45b4454152171eed45ffec14569fd5c7fb0432 /vm_eval.c
parent6d3ef1b23867cce7fb6791327b9fcab36e010277 (diff)
merges r23371 from trunk into ruby_1_9_1.
-- * vm_eval.c (rb_f_catch): gets rid of issue with gcc 4.4. a patch from Alexey Froloff in [ruby-core:23398]. [ruby-core:22924] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23515 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_eval.c')
-rw-r--r--vm_eval.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vm_eval.c b/vm_eval.c
index aaef1c71ae..0ec847882a 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -1232,7 +1232,7 @@ rb_f_catch(int argc, VALUE *argv)
{
VALUE tag;
int state;
- VALUE val = Qnil; /* OK */
+ volatile VALUE val = Qnil; /* OK */
rb_thread_t *th = GET_THREAD();
rb_control_frame_t *saved_cfp = th->cfp;