From: simonmar Date: Tue, 3 Sep 2002 15:33:10 +0000 (+0000) Subject: [project @ 2002-09-03 15:32:16 by simonmar] X-Git-Tag: Approx_11550_changesets_converted~1726 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=04c6c9fd22839897ab87e2528011bdf13eb9b5ca;p=ghc-hetmet.git [project @ 2002-09-03 15:32:16 by simonmar] GlaExts => GHC.Exts --- diff --git a/ghc/compiler/ghci/ByteCodeItbls.lhs b/ghc/compiler/ghci/ByteCodeItbls.lhs index 730852f..c7f829e 100644 --- a/ghc/compiler/ghci/ByteCodeItbls.lhs +++ b/ghc/compiler/ghci/ByteCodeItbls.lhs @@ -27,12 +27,8 @@ import Bits ( Bits(..), shiftR ) import Monad ( liftM ) -import GlaExts ( Int(I#), addr2Int# ) -#if __GLASGOW_HASKELL__ < 503 -import Ptr ( Ptr(..) ) -#else +import GHC.Exts ( Int(I#), addr2Int# ) import GHC.Ptr ( Ptr(..) ) -#endif \end{code} %************************************************************************ diff --git a/ghc/compiler/ghci/ByteCodeLink.lhs b/ghc/compiler/ghci/ByteCodeLink.lhs index 9e1e888..0ca24f8 100644 --- a/ghc/compiler/ghci/ByteCodeLink.lhs +++ b/ghc/compiler/ghci/ByteCodeLink.lhs @@ -51,7 +51,7 @@ import Data.Int ( Int64 ) import System.IO ( fixIO ) import Control.Exception ( throwDyn ) -import GlaExts ( BCO#, newBCO#, unsafeCoerce#, +import GHC.Exts ( BCO#, newBCO#, unsafeCoerce#, ByteArray#, Array#, addrToHValue#, mkApUpd0# ) import GHC.Arr ( Array(..) )