X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FHsFFI.h;h=f489be56235985ba5aeaa0439ad08657db21db27;hb=c01e472e205f09e6cdadc1c878263998f637bc8d;hp=9fce2a484d9c734fa0108fbae6ab17bbe16e88e5;hpb=d50e93cf95b68bf858be82025b56c9977335ed76;p=ghc-hetmet.git diff --git a/includes/HsFFI.h b/includes/HsFFI.h index 9fce2a4..f489be5 100644 --- a/includes/HsFFI.h +++ b/includes/HsFFI.h @@ -18,8 +18,7 @@ extern "C" { /* get types from GHC's runtime system */ #include "ghcconfig.h" -#include "RtsConfig.h" -#include "StgTypes.h" +#include "stg/Types.h" /* get limits for integral types */ #ifdef HAVE_STDINT_H @@ -84,10 +83,7 @@ typedef StgDouble HsDouble; typedef StgInt HsBool; typedef void* HsPtr; /* this should better match StgAddr */ typedef void (*HsFunPtr)(void); /* this should better match StgAddr */ -typedef void* HsForeignPtr; /* ... and this StgForeignPtr */ typedef void* HsStablePtr; -typedef void* HsAddr; /* DEPRECATED */ -typedef void* HsForeignObj; /* DEPRECATED */ /* this should correspond to the type of StgChar in StgTypes.h */ #define HS_CHAR_MIN 0 @@ -158,10 +154,6 @@ extern void hs_perform_gc (void); extern void hs_free_stable_ptr (HsStablePtr sp); extern void hs_free_fun_ptr (HsFunPtr fp); -extern int hs_hpc_module(char *modName,int modCount,StgWord64 *tixArr); -extern void hs_hpc_tick(int globIx); -extern void hs_hpc_throw(void); - /* -------------------------------------------------------------------------- */ #ifdef __cplusplus