X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghci%2FByteCodeAsm.lhs;h=4d360e1ffe3cbf4f8e8904cd9c09e6ed418c6e0a;hb=d436c70d43fb905c63220040168295e473f4b90a;hp=de85a6be400348138cbf02fa6d62764d52c85d76;hpb=831a35dd00faff195cf938659c2dd736192b865f;p=ghc-hetmet.git

diff --git a/compiler/ghci/ByteCodeAsm.lhs b/compiler/ghci/ByteCodeAsm.lhs
index de85a6b..4d360e1 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
 
@@ -385,7 +390,7 @@ mkBits findLabel st proto_insns
        literal st (MachLabel fs _ _) = litlabel st fs
        literal st (MachWord w)     = int st (fromIntegral w)
        literal st (MachInt j)      = int st (fromIntegral j)
-       literal st MachNullAddr     = int st (fromIntegral 0)
+       literal st MachNullAddr     = int st 0
        literal st (MachFloat r)    = float st (fromRational r)
        literal st (MachDouble r)   = double st (fromRational r)
        literal st (MachChar c)     = int st (ord c)