summaryrefslogtreecommitdiff
path: root/eval.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-12 20:46:23 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-12 20:46:23 +0000
commit93e93af5c03888821e5858794cc4a8fc06735ece (patch)
treeaa30d09856b708de74e5c6ac404737d909ebcb59 /eval.c
parentef7770c87b61ada97f911c563a89dbdba4985fe1 (diff)
* 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
Diffstat (limited to 'eval.c')
-rw-r--r--eval.c8
1 files changed, 4 insertions, 4 deletions
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;
}