Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/097a33f7eae35f8e9a70c4a6a6431ce17f3cc861 >--------------------------------------------------------------- commit 097a33f7eae35f8e9a70c4a6a6431ce17f3cc861 Author: David Terei <[email protected]> Date: Wed Jun 1 18:04:27 2011 -0700 SafeHaskell: Fix validation errors when Safe base used. >--------------------------------------------------------------- compiler/iface/TcIface.lhs-boot | 2 +- compiler/utils/FastString.lhs | 5 +++++ compiler/utils/GhcIO.hs | 6 +++++- compiler/utils/StringBuffer.lhs | 9 ++++++--- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/compiler/iface/TcIface.lhs-boot b/compiler/iface/TcIface.lhs-boot index d78253e..a9684a6 100644 --- a/compiler/iface/TcIface.lhs-boot +++ b/compiler/iface/TcIface.lhs-boot @@ -7,7 +7,7 @@ import TcRnTypes ( IfL ) import InstEnv ( Instance ) import FamInstEnv ( FamInst ) import CoreSyn ( CoreRule ) -import HscTypes ( TypeEnv, VectInfo, IfaceVectInfo, IfaceTrustInfo ) +import HscTypes ( TypeEnv, VectInfo, IfaceVectInfo ) import Module ( Module ) import Annotations ( Annotation ) diff --git a/compiler/utils/FastString.lhs b/compiler/utils/FastString.lhs index 062d32d..89ab758 100644 --- a/compiler/utils/FastString.lhs +++ b/compiler/utils/FastString.lhs @@ -108,7 +108,12 @@ import Data.Char ( ord ) import GhcIO ( IO(..) ) +#if __GLASGOW_HASKELL__ >= 701 +import GHC.Ptr.Unsafe ( Ptr(..) ) +#else import GHC.Ptr ( Ptr(..) ) +#endif + #if defined(__GLASGOW_HASKELL__) import GHC.Base ( unpackCString# ) #endif diff --git a/compiler/utils/GhcIO.hs b/compiler/utils/GhcIO.hs index 9d6734e..82869c2 100644 --- a/compiler/utils/GhcIO.hs +++ b/compiler/utils/GhcIO.hs @@ -1,6 +1,10 @@ + -- | A simple version compatability wrapper around GHC.IO. +-- -- This module exports both the safe and Unsafe version of GHC.IO --- after that SafeHaskell change over occured. +-- taking care of the SafeHaskell changeover which spit up the +-- old GHC.IO module. +-- module GhcIO ( #if __GLASGOW_HASKELL__ >= 701 module GHC.IO.Unsafe, diff --git a/compiler/utils/StringBuffer.lhs b/compiler/utils/StringBuffer.lhs index 1ad4879..326cb1c 100644 --- a/compiler/utils/StringBuffer.lhs +++ b/compiler/utils/StringBuffer.lhs @@ -48,14 +48,17 @@ import FastString hiding ( buf ) import FastTypes import FastFunctions -import Foreign import System.IO ( hGetBuf, hFileSize,IOMode(ReadMode), hClose - , Handle, hTell ) + , Handle, hTell, openBinaryFile ) import System.IO.Unsafe ( unsafePerformIO ) import GHC.Exts -import System.IO ( openBinaryFile ) +#if __GLASGOW_HASKELL__ >= 701 +import Foreign +#else +import Foreign hiding ( unsafePerformIO ) +#endif -- ----------------------------------------------------------------------------- -- The StringBuffer type _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
