Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch :
http://hackage.haskell.org/trac/ghc/changeset/35f53b0e94392933be5f29a50d1887cfbe5fc248 >--------------------------------------------------------------- commit 35f53b0e94392933be5f29a50d1887cfbe5fc248 Author: David Terei <[email protected]> Date: Tue Jun 7 23:58:41 2011 -0700 SafeHaskell: Fix imports of base when base unsafe >--------------------------------------------------------------- compiler/utils/FastString.lhs | 3 ++- compiler/utils/GhcIO.hs | 10 +++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/compiler/utils/FastString.lhs b/compiler/utils/FastString.lhs index 89ab758..b1449ed 100644 --- a/compiler/utils/FastString.lhs +++ b/compiler/utils/FastString.lhs @@ -96,7 +96,6 @@ import FastFunctions import Panic import Util -import Foreign import Foreign.C import GHC.Exts import System.IO @@ -109,8 +108,10 @@ import Data.Char ( ord ) import GhcIO ( IO(..) ) #if __GLASGOW_HASKELL__ >= 701 +import Foreign.Safe import GHC.Ptr.Unsafe ( Ptr(..) ) #else +import Foreign hiding ( unsafePerformIO ) import GHC.Ptr ( Ptr(..) ) #endif diff --git a/compiler/utils/GhcIO.hs b/compiler/utils/GhcIO.hs index 82869c2..17198de 100644 --- a/compiler/utils/GhcIO.hs +++ b/compiler/utils/GhcIO.hs @@ -7,14 +7,18 @@ -- module GhcIO ( #if __GLASGOW_HASKELL__ >= 701 - module GHC.IO.Unsafe, -#endif + module GHC.IO.Safe, + module GHC.IO.Unsafe +#else module GHC.IO +#endif ) where #if __GLASGOW_HASKELL__ >= 701 +import GHC.IO.Safe import GHC.IO.Unsafe +#else +import GHC.IO #endif -import GHC.IO _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
