X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=includes%2FRtsExternal.h;h=62764e1019cea5960cc567134508aae901801b92;hp=37a9bd485ceb7e42ac0b98a9454b0d713d579949;hb=55a5d8d90280a611bafb659bc80778d3927a6bff;hpb=53a5d0b0186379be1fb378b1ed591ff5f359178c diff --git a/includes/RtsExternal.h b/includes/RtsExternal.h index 37a9bd4..62764e1 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 */ @@ -67,7 +71,7 @@ extern void* createAdjustor(int cconv, StgStablePtr hptr, StgFunPtr wptr, extern void freeHaskellFunctionPtr(void* ptr); /* Hpc stuff */ -extern int hs_hpc_module(char *modName,int modCount,StgWord64 *tixArr); +extern int hs_hpc_module(char *modName,int modCount,int modHashNo,StgWord64 *tixArr); extern void hs_hpc_tick(int globIx,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); @@ -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