X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FRtsExternal.h;h=0c606e99b9de0b729afbfbbbc87775c7775582bf;hb=ed95d86d82a3ea4cf95906e500873a1cb3f91e4e;hp=b917dcf1418c49f4999e90681bf63aa20600a580;hpb=55dd028c1dc41c603316dbe843fa13c1cac30720;p=ghc-hetmet.git diff --git a/includes/RtsExternal.h b/includes/RtsExternal.h index b917dcf..0c606e9 100644 --- a/includes/RtsExternal.h +++ b/includes/RtsExternal.h @@ -15,6 +15,10 @@ /* The standard FFI interface */ #include "HsFFI.h" +#ifdef HAVE_SYS_TYPES_H +#include +#endif + /* ----------------------------------------------------------------------------- Functions exported by the RTS for use in Stg code -------------------------------------------------------------------------- */ @@ -26,8 +30,8 @@ extern void newCAF(StgClosure*); #endif /* ToDo: remove? */ -extern I_ genSymZh(void); -extern I_ resetGenSymZh(void); +extern HsInt genSymZh(void); +extern HsInt resetGenSymZh(void); /* Alternate to raise(3) for threaded rts, for OpenBSD */ extern int genericRaise(int sig); @@ -36,8 +40,8 @@ extern int genericRaise(int sig); extern int cmp_thread(StgPtr tso1, StgPtr tso2); extern int rts_getThreadId(StgPtr tso); extern int forkOS_createThread ( HsStablePtr entry ); -extern StgInt forkProcess(HsStablePtr *entry); -extern StgBool rtsSupportsBoundThreads(void); +extern pid_t forkProcess(HsStablePtr *entry); +extern HsBool rtsSupportsBoundThreads(void); extern StgInt newSpark (StgRegTable *reg, StgClosure *p); /* grimy low-level support functions defined in StgPrimFloat.c */ @@ -69,8 +73,8 @@ extern void freeHaskellFunctionPtr(void* ptr); /* Hpc stuff */ extern int hs_hpc_module(char *modName,int modCount,StgWord64 *tixArr); extern void hs_hpc_tick(int globIx,struct StgTSO_ *current_tso); -extern void hs_hpc_throw(struct StgTSO_ *current_tso); - +extern void hs_hpc_raise_event(struct StgTSO_ *current_tso); +extern void hs_hpc_thread_finished_event(struct StgTSO_ *current_tso); #if defined(mingw32_HOST_OS) extern int rts_InstallConsoleEvent ( int action, StgStablePtr *handler ); @@ -87,8 +91,8 @@ extern StgInt *signal_handlers; #if defined(mingw32_HOST_OS) void *getIOManagerEvent (void); -StgWord32 readIOManagerEvent (void); -void sendIOManagerEvent (StgWord32 event); +HsWord32 readIOManagerEvent (void); +void sendIOManagerEvent (HsWord32 event); #else extern void setIOManagerPipe (int fd); #endif