Integrate mainline changes into win32 branch. Now would be a good time

to reverse integrate the win32 branch into mainline.

p4raw-id: //depot/win32/perl@253

1 files changed, 3 insertions, 3 deletions

diff --git a/thread.h b/thread.h
index dbfb56b078..2b8e636966 100644
--- a/thread.h
+++ b/thread.h
@@ -204,7 +204,7 @@ struct thread {
     U8		Tlocalizing;
     COP *	Tcurcop;
 
-    CONTEXT *	Tcxstack;
+    PERL_CONTEXT *	Tcxstack;
     I32		Tcxstack_ix;
     I32		Tcxstack_max;
 
@@ -242,10 +242,10 @@ typedef struct thread *Thread;
 #define THRf_ZOMBIE	3
 #define THRf_DEAD	4
 
-#define THRf_DIE_FATAL	8
+#define THRf_DID_DIE	8
 
 /* ThrSTATE(t) and ThrSETSTATE(t) must only be called while holding t->mutex */
-#define ThrSTATE(t) ((t)->flags)
+#define ThrSTATE(t) ((t)->flags & THRf_STATE_MASK)
 #define ThrSETSTATE(t, s) STMT_START {		\
 	(t)->flags &= ~THRf_STATE_MASK;		\
 	(t)->flags |= (s);			\