From 8c36fa1316dfe670534a8f2ef532b866e1ca1fdb Mon Sep 17 00:00:00 2001 From: mame Date: Wed, 4 Aug 2010 10:27:07 +0000 Subject: merges r28834 from trunk into ruby_1_9_2. -- * thread_win32.c (native_thread_join): need to wait thread, of course. [ruby-dev:41911] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28855 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ thread_win32.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7a3cb9a73e..c87a4c8ee3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Aug 2 16:34:32 2010 NAKAMURA Usaku + + * thread_win32.c (native_thread_join): need to wait thread, of course. + [ruby-dev:41911] + Mon Aug 2 12:22:22 2010 NAKAMURA Usaku * file.c (file_expand_path): wrong condition. [ruby-core:31591] diff --git a/thread_win32.c b/thread_win32.c index 1391bece54..894fad92fc 100644 --- a/thread_win32.c +++ b/thread_win32.c @@ -507,7 +507,7 @@ native_thread_create(rb_thread_t *th) static void native_thread_join(HANDLE th) { - w32_wait_events(&th, 1, 0, 0); + w32_wait_events(&th, 1, INFINITE, 0); } #if USE_NATIVE_THREAD_PRIORITY -- cgit v1.2.3