diff options
| author | David Terei <davidterei@gmail.com> | 2011-06-07 23:58:41 -0700 |
|---|---|---|
| committer | David Terei <davidterei@gmail.com> | 2011-06-17 20:40:34 -0700 |
| commit | 35f53b0e94392933be5f29a50d1887cfbe5fc248 (patch) | |
| tree | 10b17d4c49f825efe49cd2c75bad961b33f83040 /compiler/utils | |
| parent | b8281d80a18c2d9b9a3c68d523c4d7abd9fd9fa7 (diff) | |
| download | haskell-35f53b0e94392933be5f29a50d1887cfbe5fc248.tar.gz | |
SafeHaskell: Fix imports of base when base unsafe
Diffstat (limited to 'compiler/utils')
| -rw-r--r-- | compiler/utils/FastString.lhs | 3 | ||||
| -rw-r--r-- | 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 89ab75815c..b1449edae2 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 82869c2da0..17198de071 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 |