summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-28 12:56:10 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-28 12:56:10 +0000
commita67c6eee7819a21fa6baeffecd6915525ebc35ca (patch)
treefa3d58907bb426a26b55717057743627cd7207c3
parent15e9a765de7fea99d55b57aff6d2046ddfe4baad (diff)
downloadruby-a67c6eee7819a21fa6baeffecd6915525ebc35ca.tar.gz
ruby-a67c6eee7819a21fa6baeffecd6915525ebc35ca.tar.xz
ruby-a67c6eee7819a21fa6baeffecd6915525ebc35ca.zip
* vm_eval.c (rb_iterate): use volatile to suppress warnings.
* eval.c (ruby_cleanup): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22678 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--eval.c2
-rw-r--r--vm_eval.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index cd0e77024..582fe1695 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Feb 28 21:52:37 2009 Tanaka Akira <akr@fsij.org>
+
+ * vm_eval.c (rb_iterate): use volatile to suppress warnings.
+
+ * eval.c (ruby_cleanup): ditto.
+
Sat Feb 28 20:09:40 2009 Tanaka Akira <akr@fsij.org>
* eval_error.c (error_print): use volatile to suppress warnings.
diff --git a/eval.c b/eval.c
index 8040e8b58..e2540cae1 100644
--- a/eval.c
+++ b/eval.c
@@ -125,7 +125,7 @@ ruby_finalize(void)
void rb_thread_stop_timer_thread(void);
int
-ruby_cleanup(int ex)
+ruby_cleanup(volatile int ex)
{
int state;
volatile VALUE errs[2];
diff --git a/vm_eval.c b/vm_eval.c
index 50dea4c05..0780f0928 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -597,7 +597,7 @@ rb_iterate(VALUE (* it_proc) (VALUE), VALUE data1,
volatile VALUE retval = Qnil;
NODE *node = NEW_IFUNC(bl_proc, data2);
rb_thread_t *th = GET_THREAD();
- rb_control_frame_t *cfp = th->cfp;
+ rb_control_frame_t *volatile cfp = th->cfp;
TH_PUSH_TAG(th);
state = TH_EXEC_TAG();