* eval.c (rb_thread_cancel_timer): fix undefined function

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@12493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 10 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 0c86195d49..48c2631939 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jun  8 17:50:17 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* eval.c (rb_thread_cancel_timer): fix undefined function
+
 Wed May 30 05:17:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_eval): get rid of SEGV at ZSUPER in a block
diff --git a/eval.c b/eval.c
index 014ee9d9d3..a118e7e615 100644
--- a/eval.c
+++ b/eval.c
@@ -11884,6 +11884,11 @@ rb_thread_cancel_timer()
 
 #else  /* !(_THREAD_SAFE || HAVE_SETITIMER) */
 int rb_thread_tick = THREAD_TICK;
+
+void
+rb_thread_cancel_timer()
+{
+}
 #endif
 
 static VALUE
diff --git a/version.h b/version.h
index 56da95fb2a..6aab6df12d 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2007-06-07"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20070607
-#define RUBY_PATCHLEVEL 35
+#define RUBY_PATCHLEVEL 36
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8