From: Malcolm Beattie <mbeattie@sable.ox.ac.uk>
Date: Tue, 25 Nov 1997 15:42:07 +0000 (+0000)
Subject: Integrate from ansi branch to mainline.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=48bfcc53740a66ec5a66616b846e1db9955c1c69;p=p5sagit%2Fp5-mst-13.2.git

Integrate from ansi branch to mainline.

p4raw-id: //depot/perl@296
---

48bfcc53740a66ec5a66616b846e1db9955c1c69
diff --cc win32/win32thread.h
index d2dfe42,38e66e9..0d92ffc
--- a/win32/win32thread.h
+++ b/win32/win32thread.h
@@@ -105,10 -105,24 +105,23 @@@ typedef HANDLE perl_mutex
  
  typedef THREAD_RET_TYPE thread_func_t(void *);
  
+ 
  START_EXTERN_C
+ 
+ #if defined(PERLDLL) && (!defined(__BORLANDC__) || defined(_DLL))
+ extern __declspec(thread) struct thread *Perl_current_thread;
+ #define SET_THR(t)   		(Perl_current_thread = t)
+ #define THR			Perl_current_thread
+ #else
+ #define THR			Perl_getTHR()
+ #define SET_THR(t)		Perl_setTHR(t)
+ #endif
+ 
  void Perl_alloc_thread_key _((void));
 -int Perl_thread_create _((struct thread *thr, thread_func_t *fn));
 -void Perl_set_thread_self _((struct thread *thr));
 -struct thread *Perl_getTHR _((void));
 -void Perl_setTHR _((struct thread *t));
 -
 +int Perl_thread_create _((struct perl_thread *thr, thread_func_t *fn));
 +void Perl_set_thread_self _((struct perl_thread *thr));
++struct perl_thread *Perl_getTHR _((void));
++void Perl_setTHR _((struct perl_thread *t));
  END_EXTERN_C
  
  #define INIT_THREADS NOOP