From d22b7e6ddbd5c616d90c82cb86fd5797cd2d5a61 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 30 Nov 2008 09:22:21 +0000 Subject: merges r20346 from trunk into ruby_1_9_1. * process.c (rb_fork): stops the timer thread during fork. [ruby-dev:37117] * thread.c (rb_thread_start_timer_thread): timer thread needs system_working to be set. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20406 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- thread.c | 1 + 1 file changed, 1 insertion(+) (limited to 'thread.c') diff --git a/thread.c b/thread.c index 9c4c6da18b..dad5c1c286 100644 --- a/thread.c +++ b/thread.c @@ -2371,6 +2371,7 @@ rb_thread_reset_timer_thread(void) void rb_thread_start_timer_thread(void) { + system_working = 1; rb_thread_create_timer_thread(); } -- cgit v1.2.3