From 9e0f3e0db9579d4271981f0804ebfac7c4e4486b Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 12 Nov 2009 05:33:23 +0000 Subject: [PATCH] * thread_win32.c (thread_errno): CreateThread does not set errno. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25728 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 +++- thread_win32.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0b7127a4c9..e174a0135c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ -Thu Nov 12 13:57:37 2009 Nobuyoshi Nakada +Thu Nov 12 14:33:21 2009 Nobuyoshi Nakada + + * thread_win32.c (thread_errno): CreateThread does not set errno. * thread.c (thread_create_core): moved failure handling from native_thread_core(). diff --git a/thread_win32.c b/thread_win32.c index 2baa60642b..dc07a38a14 100644 --- a/thread_win32.c +++ b/thread_win32.c @@ -176,9 +176,11 @@ w32_resume_thread(HANDLE handle) #ifdef HAVE__BEGINTHREADEX #define start_thread (HANDLE)_beginthreadex +#define thread_errno errno typedef unsigned long (_stdcall *w32_thread_start_func)(void*); #else #define start_thread CreateThread +#define thread_errno rb_w32_map_errno(GetLastError()) typedef LPTHREAD_START_ROUTINE w32_thread_start_func; #endif @@ -479,7 +481,7 @@ native_thread_create(rb_thread_t *th) th->thread_id = w32_create_thread(stack_size, thread_start_func_1, th); if ((th->thread_id) == 0) { - return errno ? errno : -1; + return thread_errno; } w32_resume_thread(th->thread_id);