X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FHsFFI.h;h=f489be56235985ba5aeaa0439ad08657db21db27;hb=071e8839d633d6326048702a323f1c28ebc86d48;hp=70891a2dc2e75d3afeae3d98e0a1015f253cb28e;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git

diff --git a/includes/HsFFI.h b/includes/HsFFI.h
index 70891a2..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
@@ -81,13 +80,10 @@ typedef StgWord32		HsWord32;
 typedef StgWord64		HsWord64;
 typedef StgFloat		HsFloat;
 typedef StgDouble		HsDouble;
-typedef StgBool			HsBool;
+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