diff options
| author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-04 10:27:07 +0000 |
|---|---|---|
| committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-04 10:27:07 +0000 |
| commit | 8c36fa1316dfe670534a8f2ef532b866e1ca1fdb (patch) | |
| tree | 568c65f427da8514e6861a231d76996bf8ca317d /thread_win32.c | |
| parent | 4313bec63110d061334d470c77d2394367f22702 (diff) | |
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
Diffstat (limited to 'thread_win32.c')
| -rw-r--r-- | thread_win32.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |