From: malcolm <unknown>
Date: Thu, 12 Jun 2003 10:31:29 +0000 (+0000)
Subject: [project @ 2003-06-12 10:31:29 by malcolm]
X-Git-Tag: nhc98-1-18-release~617
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=7f47cb5f9302a092978e4fa2cc335e9f81bd31bc;p=ghc-base.git

[project @ 2003-06-12 10:31:29 by malcolm]
For nhc98, temporarily make foreignPtrToPtr an alias for unsafeForeignPtrToPtr
until ghc and hugs catch up.
---

diff --git a/Foreign/ForeignPtr.hs b/Foreign/ForeignPtr.hs
index 6d7ea1a..a92ec45 100644
--- a/Foreign/ForeignPtr.hs
+++ b/Foreign/ForeignPtr.hs
@@ -23,7 +23,7 @@ module Foreign.ForeignPtr
         , newForeignPtr
         , addForeignPtrFinalizer
 	, withForeignPtr
-	, foreignPtrToPtr
+	, foreignPtrToPtr	-- will soon become unsafeForeignPtrToPtr
 	, touchForeignPtr
 	, castForeignPtr
 
@@ -45,7 +45,7 @@ import NHC.FFI
   , newForeignPtr
   , addForeignPtrFinalizer
   , withForeignPtr
-  , foreignPtrToPtr
+  , unsafeForeignPtrToPtr
   , touchForeignPtr
   , castForeignPtr
   )
@@ -112,6 +112,11 @@ withForeignPtr fo io
        return r
 #endif /* ! __NHC__ */
 
+#ifdef __NHC__
+-- temporary aliasing until ghc and hugs catch up
+foreignPtrToPtr = unsafeForeignPtrToPtr
+#endif
+
 #ifdef __HUGS__
 mallocForeignPtr :: Storable a => IO (ForeignPtr a)
 mallocForeignPtr = do