[project @ 2004-07-27 10:35:54 by ross]

[ghc-base.git] / Foreign / Marshal / Alloc.hs

diff --git a/Foreign/Marshal/Alloc.hs b/Foreign/Marshal/Alloc.hs
index 31f96ec..fb9f8dd 100644 (file)
--- a/Foreign/Marshal/Alloc.hs
+++ b/Foreign/Marshal/Alloc.hs
@@ -24,30 +24,34 @@ module Foreign.Marshal.Alloc (
   realloc,      -- :: Storable b => Ptr a        -> IO (Ptr b)
   reallocBytes, -- ::              Ptr a -> Int -> IO (Ptr a)
 
-  free          -- :: Ptr a -> IO ()
-#ifdef __HUGS__
-  , finalizerFree -- :: FunPtr (Ptr a -> IO ())
-#endif
+  free,         -- :: Ptr a -> IO ()
+  finalizerFree -- :: FinalizerPtr a
 ) where
 
 import Data.Maybe
 import Foreign.Ptr             ( Ptr, nullPtr, FunPtr )
-import Foreign.C.Types         ( CSize, CInt(..) )
+import Foreign.C.Types         ( CSize )
 import Foreign.Storable        ( Storable(sizeOf) )
 
 #ifdef __GLASGOW_HASKELL__
-import GHC.Exception           ( bracket )
+import Foreign.ForeignPtr      ( FinalizerPtr )
 import GHC.IOBase
 import GHC.Real
 import GHC.Ptr
 import GHC.Err
 import GHC.Base
+import GHC.Num
 #elif defined(__NHC__)
-import System.IO               ( bracket )
+import NHC.FFI                 ( FinalizerPtr, CInt(..) )
+import IO                      ( bracket )
 #else
 import Control.Exception       ( bracket )
 #endif
 
+#ifdef __HUGS__
+import Hugs.ForeignPtr         ( FinalizerPtr )
+#endif
+
 
 -- exported functions
 -- ------------------
@@ -117,6 +121,7 @@ realloc  = doRealloc undefined
 -- C\'s @realloc()@).
 --
 reallocBytes          :: Ptr a -> Int -> IO (Ptr a)
+reallocBytes ptr 0     = do free ptr; return nullPtr
 reallocBytes ptr size  = 
   failWhenNULL "realloc" (_realloc ptr (fromIntegral size))
 
@@ -150,9 +155,7 @@ failWhenNULL name f = do
 foreign import ccall unsafe "stdlib.h malloc"  _malloc  ::          CSize -> IO (Ptr a)
 foreign import ccall unsafe "stdlib.h realloc" _realloc :: Ptr a -> CSize -> IO (Ptr b)
 foreign import ccall unsafe "stdlib.h free"    _free    :: Ptr a -> IO ()
-#ifdef __HUGS__
--- |A pointer to a foreign function equivalent to @free@, which may be used
--- as a finalizer for storage allocated with @malloc@ or @mallocBytes@.
-foreign import ccall unsafe "stdlib.h &free"
-                       finalizerFree :: FunPtr (Ptr a -> IO ())
-#endif
+
+-- | A pointer to a foreign function equivalent to 'free', which may be used
+-- as a finalizer for storage allocated with 'malloc' or 'mallocBytes'.
+foreign import ccall unsafe "stdlib.h &free" finalizerFree :: FinalizerPtr a