X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=includes%2FHsFFI.h;h=f489be56235985ba5aeaa0439ad08657db21db27;hp=cd9f7ede8015db4cd131e42e24acd3c919e77136;hb=a2a67cd520b9841114d69a87a423dabcb3b4368e;hpb=5d379cbe65e406d5c3a848fe7fcd090cafbfeb78

diff --git a/includes/HsFFI.h b/includes/HsFFI.h
index cd9f7ed..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