diff --git a/ChangeLog b/ChangeLog
index fd1779d67f..8dea93edbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar  2 10:29:17 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_longjmp), include/ruby/intern.h (ruby_cleanup): fixed
+	  prototypes.
+
 Mon Mar  2 00:56:45 2009  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/observer.rb: The module oberservable uses now a hash to
diff --git a/eval.c b/eval.c
index e2540cae1b..2e66acd627 100644
--- a/eval.c
+++ b/eval.c
@@ -329,7 +329,7 @@ rb_frozen_class_p(VALUE klass)
     }
 }
 
-NORETURN(static void rb_longjmp(int, VALUE));
+NORETURN(static void rb_longjmp(int, volatile VALUE));
 
 static void
 rb_longjmp(int tag, volatile VALUE mesg)
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index 28d59d0cd6..1a034508ea 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -309,7 +309,7 @@ void rb_exec_end_proc(void);
 void Init_jump(void);
 void ruby_finalize(void);
 NORETURN(void ruby_stop(int));
-int ruby_cleanup(int);
+int ruby_cleanup(volatile int);
 void rb_gc_mark_threads(void);
 void rb_thread_schedule(void);
 void rb_thread_wait_fd(int);