* eval.c (rb_kill_thread): renamed in order to get rid of conflict

  with a BeOS system function.  [ruby-core:10830]


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

3 files changed, 12 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 62a02c4c25..a24549f174 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 13 05:47:58 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_kill_thread): renamed in order to get rid of conflict
+	  with a BeOS system function.  [ruby-core:10830]
+
 Tue Jun 12 14:53:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (Logging.quiet, Logging.message): added quiet flag and
diff --git a/eval.c b/eval.c
index 7ede489611..8b0d7038bd 100644
--- a/eval.c
+++ b/eval.c
@@ -11259,7 +11259,7 @@ rb_thread_run(thread)
 
 
 static void
-kill_thread(th, flags)
+rb_kill_thread(th, flags)
     rb_thread_t th;
     int flags;
 {
@@ -11294,8 +11294,8 @@ rb_thread_kill(thread)
 {
     rb_thread_t th = rb_thread_check(thread);
 
-    kill_thread(th, 0);
-	return thread;
+    rb_kill_thread(th, 0);
+    return thread;
 }
 
 
@@ -11317,7 +11317,7 @@ rb_thread_kill_bang(thread)
     VALUE thread;
 {
     rb_thread_t th = rb_thread_check(thread);
-    kill_thread(th, THREAD_NO_ENSURE);
+    rb_kill_thread(th, THREAD_NO_ENSURE);
     return thread;
 }
 
diff --git a/version.h b/version.h
index 19649fea7e..4392126c53 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2007-06-12"
+#define RUBY_RELEASE_DATE "2007-06-13"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20070612
+#define RUBY_RELEASE_CODE 20070613
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 12
+#define RUBY_RELEASE_DAY 13
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];