[project @ 1997-05-19 00:10:00 by sof]

2.0x bootable

diff --git a/ghc/compiler/simplCore/ConFold.lhs b/ghc/compiler/simplCore/ConFold.lhs
index 59765ec..5e7478d 100644 (file)
--- a/ghc/compiler/simplCore/ConFold.lhs
+++ b/ghc/compiler/simplCore/ConFold.lhs
@@ -25,8 +25,7 @@ import SimplMonad
 import TysWiredIn      ( trueDataCon, falseDataCon )
 
 #ifdef REALLY_HASKELL_1_3
-ord = fromEnum :: Char -> Int
-chr = toEnum   :: Int -> Char
+import Char(ord,chr)
 #endif
 \end{code}
 

diff --git a/ghc/compiler/simplCore/FloatIn.lhs b/ghc/compiler/simplCore/FloatIn.lhs
index 29ce8a9..9356bb2 100644 (file)
--- a/ghc/compiler/simplCore/FloatIn.lhs
+++ b/ghc/compiler/simplCore/FloatIn.lhs
@@ -23,7 +23,7 @@ import CoreSyn
 
 import FreeVars
 import Id              ( emptyIdSet, unionIdSets, unionManyIdSets,
-                         elementOfIdSet, SYN_IE(IdSet), GenId
+                         elementOfIdSet, SYN_IE(IdSet), GenId, SYN_IE(Id)
                        )
 import Util            ( nOfThem, panic, zipEqual )
 \end{code}