summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-02 01:29:19 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-02 01:29:19 +0000
commitacd7f139c4c4271420861e52a7dca914d8b07917 (patch)
tree03ad08ae878891bfb6e615d0852d4d2270a425ba
parent7d533d448c01b68b89e04ba84f2a33771ccaf4f5 (diff)
downloadruby-acd7f139c4c4271420861e52a7dca914d8b07917.tar.gz
ruby-acd7f139c4c4271420861e52a7dca914d8b07917.tar.xz
ruby-acd7f139c4c4271420861e52a7dca914d8b07917.zip
* eval.c (rb_longjmp), include/ruby/intern.h (ruby_cleanup): fixed
prototypes. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22701 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--eval.c2
-rw-r--r--include/ruby/intern.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index fd1779d67..8dea93edb 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 e2540cae1..2e66acd62 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 28d59d0cd..1a034508e 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);