summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-25 09:51:48 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-25 09:51:48 +0000
commit38f94d8edb0895ca1b7ab9207d1fcdadeefc657a (patch)
treeeb78b2cde6c0a2347b86767e6e1bdae51064b26e
parent4fff806f397998ff778ec3b7a4569e0dcedbfaec (diff)
downloadruby-38f94d8edb0895ca1b7ab9207d1fcdadeefc657a.tar.gz
ruby-38f94d8edb0895ca1b7ab9207d1fcdadeefc657a.tar.xz
ruby-38f94d8edb0895ca1b7ab9207d1fcdadeefc657a.zip
merges r20914 from trunk into ruby_1_9_1.
* thread_win32.c (Init_native_thread): need to call ruby_thread_set_native() here. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21002 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--thread_win32.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 03d44fa37..65df4af97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 22 19:10:44 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * thread_win32.c (Init_native_thread): need to call
+ ruby_thread_set_native() here.
+
Mon Dec 22 18:00:36 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/tcltklib.c: fix wrong flag value.
diff --git a/thread_win32.c b/thread_win32.c
index 0befbff4a..684085fdb 100644
--- a/thread_win32.c
+++ b/thread_win32.c
@@ -50,6 +50,7 @@ Init_native_thread(void)
rb_thread_t *th = GET_THREAD();
ruby_native_thread_key = TlsAlloc();
+ ruby_thread_set_native(th);
DuplicateHandle(GetCurrentProcess(),
GetCurrentThread(),
GetCurrentProcess(),