X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Foreign.hs;h=a26ffaf2bd401a5709622826252ee49a1d35c87a;hb=be2750a0a11b919fb03cc070074e430f88bdfa90;hp=e0f9e4c05871fac57a2ae03e57cb67018a5b5c77;hpb=b7b024c10bdf1e3c7c9becf83ebf6e90bee8511f;p=ghc-base.git

diff --git a/Foreign.hs b/Foreign.hs
index e0f9e4c..a26ffaf 100644
--- a/Foreign.hs
+++ b/Foreign.hs
@@ -1,4 +1,5 @@
-{-# OPTIONS -fno-implicit-prelude #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Foreign
@@ -15,7 +16,8 @@
 -----------------------------------------------------------------------------
 
 module Foreign
-        ( module Data.Int
+        ( module Data.Bits
+        , module Data.Int
         , module Data.Word
         , module Foreign.Ptr
         , module Foreign.ForeignPtr
@@ -23,11 +25,14 @@ module Foreign
         , module Foreign.Storable
         , module Foreign.Marshal
 
-        -- For compatibility with the FFI addendum only.  The recommended
-        -- place to get this from is System.IO.Unsafe.
+        -- | 'unsafePerformIO' is exported here for backwards
+        -- compatibility reasons only.  For doing local marshalling in
+        -- the FFI, use 'unsafeLocalState'.  For other uses, see
+        -- 'System.IO.Unsafe.unsafePerformIO'.
         , unsafePerformIO
         ) where
 
+import Data.Bits
 import Data.Int
 import Data.Word
 import Foreign.Ptr