shyouhei	2007-08-22 08:36:21 +0900 (Wed, 22 Aug 2007)

  New Revision: 13138

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/eval.c
    branches/ruby_1_8_6/version.h

  Log:
    * eval.c (rb_kill_thread): renamed in order to get rid of conflict
      with a BeOS system function.  [ruby-core:10830]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=13138&r2=13137
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=13138&r2=13137
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/eval.c?r1=13138&r2=13137

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 13137)
+++ ruby_1_8_6/ChangeLog	(revision 13138)
@@ -1,3 +1,8 @@
+Wed Aug 22 08:34:20 2007  Nobuyoshi Nakada  <nobu@r...>
+
+	* eval.c (rb_kill_thread): renamed in order to get rid of conflict
+	  with a BeOS system function.  [ruby-core:10830]
+
 Wed Aug 22 08:32:32 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* process.c (ruby_setreuid, ruby_setregid): rename to get rid of name
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 13137)
+++ ruby_1_8_6/version.h	(revision 13138)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2007-08-22"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20070822
-#define RUBY_PATCHLEVEL 43
+#define RUBY_PATCHLEVEL 44
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_6/eval.c
===================================================================
--- ruby_1_8_6/eval.c	(revision 13137)
+++ ruby_1_8_6/eval.c	(revision 13138)
@@ -11268,7 +11268,7 @@
 
 
 static void
-kill_thread(th, flags)
+rb_kill_thread(th, flags)
     rb_thread_t th;
     int flags;
 {
@@ -11303,7 +11303,7 @@
 {
     rb_thread_t th = rb_thread_check(thread);
 
-    kill_thread(th, 0);
+    rb_kill_thread(th, 0);
     return thread;
 }
 
@@ -11326,7 +11326,7 @@
     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;
 }
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml