akr	2010-06-06 08:26:43 +0900 (Sun, 06 Jun 2010)

  New Revision: 28183

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28183

  Log:
    * vm.c (Init_BareVM): call Init_native_thread here.
    
    * thread.c (Init_Thread): don't call Init_native_thread.
    
    * thread_pthread.c (Init_native_thread): exported.
    
    * thread_win32.c (Init_native_thread): ditto.
    
    [ruby-dev:41536]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/thread.c
    branches/ruby_1_9_2/thread_pthread.c
    branches/ruby_1_9_2/thread_win32.c
    branches/ruby_1_9_2/vm.c
    trunk/ChangeLog
    trunk/thread.c
    trunk/thread_pthread.c
    trunk/thread_win32.c
    trunk/vm.c

Index: thread_win32.c
===================================================================
--- thread_win32.c	(revision 28182)
+++ thread_win32.c	(revision 28183)
@@ -44,7 +44,7 @@
     return TlsSetValue(ruby_native_thread_key, th);
 }
 
-static void
+void
 Init_native_thread(void)
 {
     rb_thread_t *th = GET_THREAD();
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28182)
+++ ChangeLog	(revision 28183)
@@ -1,3 +1,15 @@
+Sun Jun  6 08:26:01 2010  Tanaka Akira  <akr@f...>
+
+	* vm.c (Init_BareVM): call Init_native_thread here.
+
+	* thread.c (Init_Thread): don't call Init_native_thread.
+
+	* thread_pthread.c (Init_native_thread): exported.
+
+	* thread_win32.c (Init_native_thread): ditto.
+
+	[ruby-dev:41536]
+
 Sun Jun  6 08:21:17 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* NEWS: Enumerable#join has been reverted.  [ruby-core:30604]
Index: thread_pthread.c
===================================================================
--- thread_pthread.c	(revision 28182)
+++ thread_pthread.c	(revision 28183)
@@ -163,7 +163,7 @@
     return pthread_setspecific(ruby_native_thread_key, th) == 0;
 }
 
-static void
+void
 Init_native_thread(void)
 {
     rb_thread_t *th = GET_THREAD();
Index: thread.c
===================================================================
--- thread.c	(revision 28182)
+++ thread.c	(revision 28183)
@@ -4239,7 +4239,6 @@
     rb_define_method(rb_cThread, "add_trace_func", thread_add_trace_func_m, 1);
 
     /* init thread core */
-    Init_native_thread();
     {
 	/* main thread setting */
 	{
Index: vm.c
===================================================================
--- vm.c	(revision 28182)
+++ vm.c	(revision 28183)
@@ -2110,6 +2110,8 @@
 #endif
 void ruby_thread_init_stack(rb_thread_t *th);
 
+extern void Init_native_thread(void);
+
 void
 Init_BareVM(void)
 {
@@ -2130,6 +2132,7 @@
 #endif
     ruby_current_vm = vm;
 
+    Init_native_thread();
     th_init2(th, 0);
     th->vm = vm;
     ruby_thread_init_stack(th);
Index: ruby_1_9_2/thread_win32.c
===================================================================
--- ruby_1_9_2/thread_win32.c	(revision 28182)
+++ ruby_1_9_2/thread_win32.c	(revision 28183)
@@ -44,7 +44,7 @@
     return TlsSetValue(ruby_native_thread_key, th);
 }
 
-static void
+void
 Init_native_thread(void)
 {
     rb_thread_t *th = GET_THREAD();
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28182)
+++ ruby_1_9_2/ChangeLog	(revision 28183)
@@ -1,3 +1,15 @@
+Sun Jun  6 08:26:01 2010  Tanaka Akira  <akr@f...>
+
+	* vm.c (Init_BareVM): call Init_native_thread here.
+
+	* thread.c (Init_Thread): don't call Init_native_thread.
+
+	* thread_pthread.c (Init_native_thread): exported.
+
+	* thread_win32.c (Init_native_thread): ditto.
+
+	[ruby-dev:41536]
+
 Sun Jun  6 08:21:17 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* NEWS: Enumerable#join has been reverted.  [ruby-core:30604]
Index: ruby_1_9_2/thread_pthread.c
===================================================================
--- ruby_1_9_2/thread_pthread.c	(revision 28182)
+++ ruby_1_9_2/thread_pthread.c	(revision 28183)
@@ -163,7 +163,7 @@
     return pthread_setspecific(ruby_native_thread_key, th) == 0;
 }
 
-static void
+void
 Init_native_thread(void)
 {
     rb_thread_t *th = GET_THREAD();
Index: ruby_1_9_2/thread.c
===================================================================
--- ruby_1_9_2/thread.c	(revision 28182)
+++ ruby_1_9_2/thread.c	(revision 28183)
@@ -4239,7 +4239,6 @@
     rb_define_method(rb_cThread, "add_trace_func", thread_add_trace_func_m, 1);
 
     /* init thread core */
-    Init_native_thread();
     {
 	/* main thread setting */
 	{
Index: ruby_1_9_2/vm.c
===================================================================
--- ruby_1_9_2/vm.c	(revision 28182)
+++ ruby_1_9_2/vm.c	(revision 28183)
@@ -2110,6 +2110,8 @@
 #endif
 void ruby_thread_init_stack(rb_thread_t *th);
 
+extern void Init_native_thread(void);
+
 void
 Init_BareVM(void)
 {
@@ -2130,6 +2132,7 @@
 #endif
     ruby_current_vm = vm;
 
+    Init_native_thread();
     th_init2(th, 0);
     th->vm = vm;
     ruby_thread_init_stack(th);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/