[project @ 2002-12-23 13:33:16 by malcolm]

[haskell-directory.git] / Foreign / Storable.hs

diff --git a/Foreign/Storable.hs b/Foreign/Storable.hs
index e5d5202..83d8e75 100644 (file)
--- a/Foreign/Storable.hs
+++ b/Foreign/Storable.hs
@@ -29,6 +29,11 @@ module Foreign.Storable
         ) where
 
 
+#ifdef __NHC__
+import NHC.FFI (Storable(..),Ptr,FunPtr,StablePtr
+               ,Int8,Int16,Int32,Int64,Word8,Word16,Word32,Word64)
+#else
+
 import Control.Monad           ( liftM )
 
 #include "MachDeps.h"
@@ -47,11 +52,14 @@ import GHC.Err
 import GHC.IOBase
 import GHC.Base
 #else
+import Data.Int
+import Data.Word
 import Foreign.Ptr
+import Foreign.StablePtr
 #endif
 
 #ifdef __HUGS__
-import PrelImpl
+import Hugs.Prelude
 import Hugs.Storable
 #endif
 
@@ -234,3 +242,5 @@ STORABLE(Int32,SIZEOF_INT32,ALIGNMENT_INT32,
 
 STORABLE(Int64,SIZEOF_INT64,ALIGNMENT_INT64,
         readInt64OffPtr,writeInt64OffPtr)
+
+#endif