X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Foreign.hs;h=9fef16ff079b177dec0734a37cb4beceeaf28f08;hb=b210a9e5938f1829c293c8685b285a830051708c;hp=c4d07cd86b9ec5a8b2faa80173a00151948133a3;hpb=f7a485978f04e84b086f1974b88887cc72d832d0;p=ghc-base.git

diff --git a/Foreign.hs b/Foreign.hs
index c4d07cd..9fef16f 100644
--- a/Foreign.hs
+++ b/Foreign.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS -fno-implicit-prelude #-}
+{-# OPTIONS_GHC -fno-implicit-prelude #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Foreign
@@ -15,25 +15,27 @@
 -----------------------------------------------------------------------------
 
 module Foreign
-        ( module Data.Int
-	, module Data.Word
+        ( module Data.Bits
+        , module Data.Int
+        , module Data.Word
 	, module Foreign.Ptr
-	, module Foreign.ForeignPtr
-	, module Foreign.StablePtr
+        , module Foreign.ForeignPtr
+        , module Foreign.StablePtr
         , module Foreign.Storable
-	, module Foreign.Marshal.Alloc
-	, module Foreign.Marshal.Array
-	, module Foreign.Marshal.Error
-	, module Foreign.Marshal.Utils
+        , module Foreign.Marshal
+
+        -- | For compatibility with the FFI addendum only.  The recommended
+        -- place to get this from is "System.IO.Unsafe".
+        , unsafePerformIO
         ) where
 
+import Data.Bits
 import Data.Int
 import Data.Word
 import Foreign.Ptr
 import Foreign.ForeignPtr
 import Foreign.StablePtr
 import Foreign.Storable
-import Foreign.Marshal.Alloc
-import Foreign.Marshal.Array
-import Foreign.Marshal.Error
-import Foreign.Marshal.Utils
+import Foreign.Marshal
+
+import System.IO.Unsafe (unsafePerformIO)