From 9c50139793fc5b8b937d9bc1864018ed9eeebdbf Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 25 Dec 2008 09:56:30 +0000 Subject: merges r20976 from trunk into ruby_1_9_1. * thread.c (thread_start_func_2): sets native thread key. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21030 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ thread.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 06e66f809..0c0972895 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Dec 25 01:52:34 2008 Nobuyoshi Nakada + + * thread.c (thread_start_func_2): sets native thread key. + Thu Dec 25 01:09:23 2008 TAKAO Kouji * test/readline/test_readline_history.rb: check the encoding that diff --git a/thread.c b/thread.c index 31138611e..74242ea11 100644 --- a/thread.c +++ b/thread.c @@ -362,6 +362,8 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_s rb_thread_t *main_th; VALUE errinfo = Qnil; + ruby_thread_set_native(th); + th->machine_stack_start = stack_start; #ifdef __ia64 th->machine_register_stack_start = register_stack_start; -- cgit