diff --git a/ChangeLog b/ChangeLog
index cd0e77024b..582fe16955 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 8040e8b585..e2540cae1b 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 50dea4c05b..0780f0928e 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();