diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2009-05-29 13:18:22 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2009-05-29 13:18:22 +0000 |
| commit | 1c83695b5b9ae3175c18908c1d58aeadb1f225ae (patch) | |
| tree | 31d3073656ae76ac32d0a4819c9bbfc6bd82ecd6 /compiler/ghci | |
| parent | 2675f2b68794ef6712e1ea0b9ec110c46c9e5ebf (diff) | |
| download | haskell-1c83695b5b9ae3175c18908c1d58aeadb1f225ae.tar.gz | |
Changes for the new IO library, mainly base-package modules moving around
Diffstat (limited to 'compiler/ghci')
| -rw-r--r-- | compiler/ghci/ByteCodeAsm.lhs | 7 | ||||
| -rw-r--r-- | compiler/ghci/RtClosureInspect.hs | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/compiler/ghci/ByteCodeAsm.lhs b/compiler/ghci/ByteCodeAsm.lhs index 66a15004f9..4d360e1ffe 100644 --- a/compiler/ghci/ByteCodeAsm.lhs +++ b/compiler/ghci/ByteCodeAsm.lhs @@ -46,9 +46,14 @@ import Data.Int ( Int64 ) import Data.Char ( ord ) import GHC.Base ( ByteArray#, MutableByteArray#, RealWorld ) -import GHC.IOBase ( IO(..) ) import GHC.Ptr ( Ptr(..) ) +#if __GLASGOW_HASKELL__ >= 611 +import GHC.IO ( IO(..) ) +#else +import GHC.IOBase ( IO(..) ) +#endif + -- ----------------------------------------------------------------------------- -- Unlinked BCOs diff --git a/compiler/ghci/RtClosureInspect.hs b/compiler/ghci/RtClosureInspect.hs index 4996fdb2b3..f90b1ca03c 100644 --- a/compiler/ghci/RtClosureInspect.hs +++ b/compiler/ghci/RtClosureInspect.hs @@ -60,7 +60,12 @@ import Constants ( wORD_SIZE ) import GHC.Arr ( Array(..) ) import GHC.Exts -import GHC.IOBase ( IO(IO) ) + +#if __GLASGOW_HASKELL__ >= 611 +import GHC.IO ( IO(..) ) +#else +import GHC.IOBase ( IO(..) ) +#endif import Control.Monad import Data.Maybe |