X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FTSO.h;h=22f3e530a8c6626867e0a73ae7e371def2e712f0;hb=a20ec0ced36bca7cd0594528922dbe31a6186eae;hp=f72d3bb149f403b9ed26450c311339d40b2b37b0;hpb=07e22b02f96a06ca7186f773dfc7c08f478a6877;p=ghc-hetmet.git

diff --git a/ghc/includes/TSO.h b/ghc/includes/TSO.h
index f72d3bb..22f3e53 100644
--- a/ghc/includes/TSO.h
+++ b/ghc/includes/TSO.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: TSO.h,v 1.33 2003/11/12 17:27:05 sof Exp $
+ * $Id: TSO.h,v 1.34 2004/03/01 14:18:35 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -161,11 +161,9 @@ typedef enum {
   , BlockedOnGA  // blocked on a remote closure represented by a Global Address
   , BlockedOnGA_NoSend // same as above but without sending a Fetch message
 #endif
-#if defined(RTS_SUPPORTS_THREADS)
   , BlockedOnCCall
-  , BlockedOnCCall_NoUnblockExc // same as above but don't unblock async exceptions
-  				// in resumeThread()
-#endif
+  , BlockedOnCCall_NoUnblockExc // same as above but don't unblock
+				// async exceptions in resumeThread()
 } StgTSOBlockReason;
 
 #if defined(mingw32_TARGET_OS)
@@ -204,12 +202,13 @@ typedef struct StgTSO_ {
   StgMutClosure *    mut_link;	     /* TSO's are mutable of course! */
   struct StgTSO_*    global_link;    /* Links all threads together */
   
-  StgTSOWhatNext     what_next   : 16;
-  StgTSOBlockReason  why_blocked : 16;
-  StgTSOBlockInfo    block_info;
-  struct StgTSO_*    blocked_exceptions;
-  StgThreadID        id;
-  int                saved_errno;
+  StgTSOWhatNext         what_next   : 16;
+  StgTSOBlockReason      why_blocked : 16;
+  StgTSOBlockInfo        block_info;
+  struct StgTSO_*        blocked_exceptions;
+  StgThreadID            id;
+  int                    saved_errno;
+  struct StgMainThread_* main;
   
   MAYBE_EMPTY_STRUCT(StgTSOTickyInfo,ticky)
   MAYBE_EMPTY_STRUCT(StgTSOProfInfo,prof)