[project @ 2001-01-08 12:31:34 by rrt]

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

diff --git a/ghc/includes/HsFFI.h b/ghc/includes/HsFFI.h
index 33b76ff..60f41d5 100644 (file)
--- a/ghc/includes/HsFFI.h
+++ b/ghc/includes/HsFFI.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: HsFFI.h,v 1.11 2000/12/04 12:31:20 simonmar Exp $
+ * $Id: HsFFI.h,v 1.13 2001/01/03 03:10:32 chak Exp $
  *
  * (c) The GHC Team, 2000
  *
@@ -78,9 +78,12 @@ typedef StgWord64            HsWord64;
 typedef StgFloat               HsFloat;
 typedef StgDouble              HsDouble;
 typedef StgBool                        HsBool;
-typedef void*                  HsAddr;         /* this should better match StgAddr */
-typedef void*                  HsForeignObj;   /* ... and this StgForeignPtr       */
+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