Integrate from ansi branch to mainline.

[p5sagit/p5-mst-13.2.git] / win32 / win32thread.c

diff --git a/win32/win32thread.c b/win32/win32thread.c
index eefa92c..3e63327 100644 (file)
--- a/win32/win32thread.c
+++ b/win32/win32thread.c
@@ -1,18 +1,18 @@
 #include "EXTERN.h"
 #include "perl.h"
 
-__declspec(thread) struct thread *current_thread;
+__declspec(thread) struct thread *Perl_current_thread = NULL;
 
 void
 Perl_setTHR(struct thread *t)
 {
- current_thread = t;
+ Perl_current_thread = t;
 }
 
 struct thread *
 Perl_getTHR(void)
 {
- return current_thread;
+ return Perl_current_thread;
 }
 
 void
@@ -29,7 +29,7 @@ Perl_alloc_thread_key(void)
 }
 
 void
-Perl_set_thread_self(struct thread *thr)
+Perl_set_thread_self(struct perl_thread *thr)
 {
 #ifdef USE_THREADS
     /* Set thr->self.  GetCurrentThread() retrurns a pseudo handle, need
@@ -47,7 +47,7 @@ Perl_set_thread_self(struct thread *thr)
 
 #ifdef USE_THREADS
 int
-Perl_thread_create(struct thread *thr, thread_func_t *fn)
+Perl_thread_create(struct perl_thread *thr, thread_func_t *fn)
 {
     DWORD junk;