update submodules for GHC.HetMet.GArrow -> Control.GArrow renaming

[ghc-hetmet.git] / includes / HsFFI.h

diff --git a/includes/HsFFI.h b/includes/HsFFI.h
index cd9f7ed..dceabab 100644 (file)
--- 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
@@ -104,9 +100,11 @@ typedef void*                      HsForeignObj;   /* DEPRECATED */
 #if   SIZEOF_VOID_P == 8
 #define HS_INT_MIN             __INT64_MIN
 #define HS_INT_MAX             __INT64_MAX
+#define HS_WORD_MAX            __UINT64_MAX
 #elif SIZEOF_VOID_P == 4
 #define HS_INT_MIN             __INT32_MIN
 #define HS_INT_MAX             __INT32_MAX
+#define HS_WORD_MAX            __UINT32_MAX
 #else
 #error GHC untested on this architecture: sizeof(void *) != 4 or 8
 #endif