Commit 097a33f7 authored by dterei's avatar dterei

SafeHaskell: Fix validation errors when Safe base used.

parent ce673b2b
...@@ -7,7 +7,7 @@ import TcRnTypes ( IfL ) ...@@ -7,7 +7,7 @@ import TcRnTypes ( IfL )
import InstEnv ( Instance ) import InstEnv ( Instance )
import FamInstEnv ( FamInst ) import FamInstEnv ( FamInst )
import CoreSyn ( CoreRule ) import CoreSyn ( CoreRule )
import HscTypes ( TypeEnv, VectInfo, IfaceVectInfo, IfaceTrustInfo ) import HscTypes ( TypeEnv, VectInfo, IfaceVectInfo )
import Module ( Module ) import Module ( Module )
import Annotations ( Annotation ) import Annotations ( Annotation )
......
...@@ -108,7 +108,12 @@ import Data.Char ( ord ) ...@@ -108,7 +108,12 @@ import Data.Char ( ord )
import GhcIO ( IO(..) ) import GhcIO ( IO(..) )
#if __GLASGOW_HASKELL__ >= 701
import GHC.Ptr.Unsafe ( Ptr(..) )
#else
import GHC.Ptr ( Ptr(..) ) import GHC.Ptr ( Ptr(..) )
#endif
#if defined(__GLASGOW_HASKELL__) #if defined(__GLASGOW_HASKELL__)
import GHC.Base ( unpackCString# ) import GHC.Base ( unpackCString# )
#endif #endif
......
-- | A simple version compatability wrapper around GHC.IO. -- | A simple version compatability wrapper around GHC.IO.
--
-- This module exports both the safe and Unsafe version of GHC.IO -- This module exports both the safe and Unsafe version of GHC.IO
-- taking care of the SafeHaskell changeover which spit up the
-- old GHC.IO module.
--
module GhcIO ( module GhcIO (
#if __GLASGOW_HASKELL__ >= 701 #if __GLASGOW_HASKELL__ >= 701
module GHC.IO.Unsafe, module GHC.IO.Unsafe,
......
...@@ -48,14 +48,17 @@ import FastString hiding ( buf ) ...@@ -48,14 +48,17 @@ import FastString hiding ( buf )
import FastTypes import FastTypes
import FastFunctions import FastFunctions
import Foreign
import System.IO ( hGetBuf, hFileSize,IOMode(ReadMode), hClose import System.IO ( hGetBuf, hFileSize,IOMode(ReadMode), hClose
, Handle, hTell ) , Handle, hTell, openBinaryFile )
import System.IO.Unsafe ( unsafePerformIO ) import System.IO.Unsafe ( unsafePerformIO )
import GHC.Exts import GHC.Exts
import System.IO ( openBinaryFile ) #if __GLASGOW_HASKELL__ >= 701
import Foreign
#else
import Foreign hiding ( unsafePerformIO )
#endif
-- ----------------------------------------------------------------------------- -- -----------------------------------------------------------------------------
-- The StringBuffer type -- The StringBuffer type
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment