X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FException.h;h=291ad20b6b5ec075037a8edd54a547fbe63d7742;hb=272a418428beede04a9c4ae027474878c59d6ca1;hp=da214d6563eed17d2247b9ceb21c5192530f7d86;hpb=9ac55e08e159d7a4647ab01e7872e69dd762f275;p=ghc-hetmet.git diff --git a/ghc/rts/Exception.h b/ghc/rts/Exception.h index da214d6..291ad20 100644 --- a/ghc/rts/Exception.h +++ b/ghc/rts/Exception.h @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: Exception.h,v 1.4 2000/12/04 12:31:20 simonmar Exp $ + * $Id: Exception.h,v 1.7 2003/11/12 17:49:07 sof Exp $ * * (c) The GHC Team, 1998-2000 * @@ -7,14 +7,14 @@ * * ---------------------------------------------------------------------------*/ -extern const StgInfoTable stg_blockAsyncExceptionszh_ret_info; -extern const StgInfoTable stg_unblockAsyncExceptionszh_ret_info; +extern const StgRetInfoTable stg_blockAsyncExceptionszh_ret_info; +extern const StgRetInfoTable stg_unblockAsyncExceptionszh_ret_info; /* Determine whether a thread is interruptible (ie. blocked * indefinitely). Interruptible threads can be sent an exception with * killThread# even if they have async exceptions blocked. */ -static __inline__ int +INLINE_HEADER int interruptible(StgTSO *t) { switch (t->why_blocked) { @@ -22,6 +22,9 @@ interruptible(StgTSO *t) case BlockedOnException: case BlockedOnRead: case BlockedOnWrite: +#if defined(mingw32_TARGET_OS) + case BlockedOnDoProc: +#endif case BlockedOnDelay: return 1; default: