projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
findSpark: exit if there's a returning foreign call
[ghc-hetmet.git]
/
includes
/
HsFFI.h
diff --git
a/includes/HsFFI.h
b/includes/HsFFI.h
index
70891a2
..
f489be5
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"
/* 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
/* 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 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* 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* 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
/* this should correspond to the type of StgChar in StgTypes.h */
#define HS_CHAR_MIN 0