X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Foreign.hs;h=e0f9e4c05871fac57a2ae03e57cb67018a5b5c77;hb=87b12b80ff0ae203ceb5d777e10688fbd666e02c;hp=0b22468dca2d04926938662ef68fc1feb2ce7ee4;hpb=53d88f36b842166ebdc2c4937fb865d27ffbd766;p=ghc-base.git

diff --git a/Foreign.hs b/Foreign.hs
index 0b22468..e0f9e4c 100644
--- a/Foreign.hs
+++ b/Foreign.hs
@@ -3,7 +3,7 @@
 -- |
 -- 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
@@ -16,15 +16,16 @@
 
 module Foreign
         ( module Data.Int
-	, module Data.Word
-	, module Foreign.Ptr
-	, module Foreign.ForeignPtr
-	, module Foreign.StablePtr
+        , module Data.Word
+        , module Foreign.Ptr
+        , 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.Int
@@ -33,7 +34,6 @@ 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)