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

diff --git a/Foreign.hs b/Foreign.hs
index 9c3d045..9fef16f 100644
--- a/Foreign.hs
+++ b/Foreign.hs
@@ -1,42 +1,41 @@
-{-# OPTIONS -fno-implicit-prelude #-}
+{-# OPTIONS_GHC -fno-implicit-prelude #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Foreign
 -- Copyright   :  (c) The FFI task force 2001
--- License     :  BSD-style (see the file libraries/core/LICENSE)
+-- License     :  BSD-style (see the file libraries/base/LICENSE)
 -- 
 -- Maintainer  :  ffi@haskell.org
 -- Stability   :  provisional
 -- Portability :  portable
 --
 -- A collection of data types, classes, and functions for interfacing
--- with another programming language. This is only a convenience module
--- in the future, but currently it has the additional task of hiding
--- those entities exported from other modules, which are not part of the
--- FFI proposal.
+-- with another programming language.
 --
 -----------------------------------------------------------------------------
 
 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)