X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Foreign%2FPtr.hs;h=f57e1ac52d67da9ef45bef84fe5968690c11bdc0;hb=10de2c656f74562b662c22928be85e1b3ccda796;hp=23706a876205f48e2d9707fda75666eedfe5469d;hpb=5e70ec8f27f4f62d9f1137e931b4d64d37eb221e;p=ghc-base.git

diff --git a/Foreign/Ptr.hs b/Foreign/Ptr.hs
index 23706a8..f57e1ac 100644
--- a/Foreign/Ptr.hs
+++ b/Foreign/Ptr.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fno-implicit-prelude #-}
+{-# OPTIONS_GHC -XNoImplicitPrelude #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Foreign.Ptr
@@ -18,22 +18,22 @@
 module Foreign.Ptr (
 
     -- * Data pointers
-    
+
     Ptr,      -- data Ptr a
     nullPtr,      -- :: Ptr a
     castPtr,      -- :: Ptr a -> Ptr b
     plusPtr,      -- :: Ptr a -> Int -> Ptr b
     alignPtr,     -- :: Ptr a -> Int -> Ptr a
     minusPtr,     -- :: Ptr a -> Ptr b -> Int
-    
+
     -- * Function pointers
-    
+
     FunPtr,      -- data FunPtr a
     nullFunPtr,      -- :: FunPtr a
     castFunPtr,      -- :: FunPtr a -> FunPtr b
     castFunPtrToPtr, -- :: FunPtr a -> Ptr b
     castPtrToFunPtr, -- :: Ptr a -> FunPtr b
-    
+
     freeHaskellFunPtr, -- :: FunPtr a -> IO ()
     -- Free the function pointer created by foreign export dynamic.
 
@@ -57,16 +57,17 @@ import GHC.Read
 import GHC.Real
 import GHC.Show
 import GHC.Enum
-import GHC.Word		( Word(..) )
+import GHC.Word         ( Word(..) )
 
 import Data.Int
 import Data.Word
 #else
+import Control.Monad    ( liftM )
 import Foreign.C.Types
 #endif
 
 import Data.Bits
-import Data.Typeable 	( Typeable(..), mkTyCon, mkTyConApp )
+import Data.Typeable    ( Typeable(..), mkTyCon, mkTyConApp )
 import Foreign.Storable ( Storable(..) )
 
 #ifdef __NHC__
@@ -107,12 +108,12 @@ foreign import ccall unsafe "freeHaskellFunctionPtr"
 -- | An unsigned integral type that can be losslessly converted to and from
 -- @Ptr@.
 INTEGRAL_TYPE(WordPtr,tyConWordPtr,"WordPtr",Word)
-	-- Word and Int are guaranteed pointer-sized in GHC
+        -- Word and Int are guaranteed pointer-sized in GHC
 
 -- | A signed integral type that can be losslessly converted to and from
 -- @Ptr@.
 INTEGRAL_TYPE(IntPtr,tyConIntPtr,"IntPtr",Int)
-	-- Word and Int are guaranteed pointer-sized in GHC
+        -- Word and Int are guaranteed pointer-sized in GHC
 
 -- | casts a @Ptr@ to a @WordPtr@
 ptrToWordPtr :: Ptr a -> WordPtr