From: chak <unknown>
Date: Wed, 3 Jan 2001 03:10:32 +0000 (+0000)
Subject: [project @ 2001-01-03 03:10:32 by chak]
X-Git-Tag: Approximately_9120_patches~2989
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=1a9add156bf8bcb5aa1b98f177b01d91ee9d59f4

[project @ 2001-01-03 03:10:32 by chak]
* Deprecated `Addr' and `freeHaskellFunctionPtr'

  I deprecated them only in the comments and docu.  Using a DEPRECATED pragma
  on the `Addr' functions doesn't make sense, because `Ptr' internally is
  build on top of `Addr'.

* Added `HsPtr' and `HsFunPtr' to `HsFFI.h'; deprecated `HsAddr'

* Updated the docu to reflect these changes
---

diff --git a/ghc/includes/HsFFI.h b/ghc/includes/HsFFI.h
index 5f9f1cd..60f41d5 100644
--- a/ghc/includes/HsFFI.h
+++ b/ghc/includes/HsFFI.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: HsFFI.h,v 1.12 2000/12/13 11:57:19 simonmar Exp $
+ * $Id: HsFFI.h,v 1.13 2001/01/03 03:10:32 chak Exp $
  *
  * (c) The GHC Team, 2000
  *
@@ -78,10 +78,12 @@ typedef StgWord64		HsWord64;
 typedef StgFloat		HsFloat;
 typedef StgDouble		HsDouble;
 typedef StgBool			HsBool;
-typedef void*			HsAddr;         /* 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*			HsForeignObj;   /* DEPRECATED */
 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