From 25fa9378282b774fcbdcaa9bc9d6b5ba4fd29633 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Tue, 21 Aug 2007 23:36:21 +0000 Subject: * eval.c (rb_kill_thread): renamed in order to get rid of conflict with a BeOS system function. [ruby-core:10830] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@13138 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ eval.c | 6 +++--- version.h | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b7b8bb74..da06fe908 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Aug 22 08:34:20 2007 Nobuyoshi Nakada + + * 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 * process.c (ruby_setreuid, ruby_setregid): rename to get rid of name diff --git a/eval.c b/eval.c index a118e7e61..56a4bd11a 100644 --- a/eval.c +++ b/eval.c @@ -11268,7 +11268,7 @@ rb_thread_run(thread) static void -kill_thread(th, flags) +rb_kill_thread(th, flags) rb_thread_t th; int flags; { @@ -11303,7 +11303,7 @@ rb_thread_kill(thread) { rb_thread_t th = rb_thread_check(thread); - kill_thread(th, 0); + rb_kill_thread(th, 0); return thread; } @@ -11326,7 +11326,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 882e5a1fc..081ed2784 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit