X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FRaiseAsync.h;h=336ab30e33adb52edf14b03c0c5ef21b9ffc5a77;hb=b2bd63f99d643f6b3eb30bb72bb9ae26d4183252;hp=96eb96e10b5529cdd19dce8a55ea874da34448b5;hpb=9a9803e8dc80ba41bd3e2d31228e64fa6b61060e;p=ghc-hetmet.git

diff --git a/rts/RaiseAsync.h b/rts/RaiseAsync.h
index 96eb96e..336ab30 100644
--- a/rts/RaiseAsync.h
+++ b/rts/RaiseAsync.h
@@ -14,7 +14,7 @@
 
 #ifndef CMINUSMINUS
 
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
 
 void throwToSingleThreaded (Capability *cap,
 			    StgTSO *tso,
@@ -29,16 +29,13 @@ void suspendComputation (Capability *cap,
 			 StgTSO *tso, 
 			 StgUpdateFrame *stop_here);
 
-nat throwTo (Capability *cap,	         // the Capability we hold 
-	     StgTSO *source,	         // the TSO sending the exception
-	     StgTSO *target,             // the TSO receiving the exception
-	     StgClosure *exception,      // the exception closure
-	     /*[out]*/ void **out   // pass to throwToReleaseTarget()
-    );
+MessageThrowTo *throwTo (Capability *cap,      // the Capability we hold 
+                         StgTSO *source,
+                         StgTSO *target,
+                         StgClosure *exception); // the exception closure
 
-#ifdef THREADED_RTS
-void throwToReleaseTarget (void *tso);
-#endif
+nat throwToMsg (Capability *cap,
+                MessageThrowTo *msg);
 
 int  maybePerformBlockedException (Capability *cap, StgTSO *tso);
 void awakenBlockedExceptionQueue  (Capability *cap, StgTSO *tso);
@@ -52,7 +49,7 @@ interruptible(StgTSO *t)
 {
   switch (t->why_blocked) {
   case BlockedOnMVar:
-  case BlockedOnException:
+  case BlockedOnMsgThrowTo:
   case BlockedOnRead:
   case BlockedOnWrite:
 #if defined(mingw32_HOST_OS)
@@ -67,7 +64,7 @@ interruptible(StgTSO *t)
   }
 }
 
-END_RTS_PRIVATE
+#include "EndPrivate.h"
 
 #endif /* CMINUSMINUS */