From: sof <unknown>
Date: Mon, 19 May 1997 00:10:29 +0000 (+0000)
Subject: [project @ 1997-05-19 00:10:00 by sof]
X-Git-Tag: Approximately_1000_patches_recorded~596
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=a915fa61939f432bcd1e5dca7e0746307a822d50;p=ghc-hetmet.git

[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
--- 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
--- 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}