From: ross Date: Wed, 2 Jul 2003 19:41:43 +0000 (+0000) Subject: [project @ 2003-07-02 19:41:20 by ross] X-Git-Tag: Approx_11550_changesets_converted~710 X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=3cf18a5382d49f5a7ecce365bbd59ebe07a407fe [project @ 2003-07-02 19:41:20 by ross] import fix --- diff --git a/ghc/compiler/codeGen/CgBindery.lhs b/ghc/compiler/codeGen/CgBindery.lhs index 15a50fd..b195b5c 100644 --- a/ghc/compiler/codeGen/CgBindery.lhs +++ b/ghc/compiler/codeGen/CgBindery.lhs @@ -45,9 +45,7 @@ import VarSet ( varSetElems ) import Literal ( Literal ) import Maybes ( catMaybes, maybeToBool, seqMaybe ) import Name ( isInternalName, NamedThing(..) ) -#ifdef DEBUG import PprAbsC ( pprAmode, pprMagicId ) -#endif import PrimRep ( PrimRep(..) ) import StgSyn ( StgArg, StgLiveVars, GenStgArg(..), isStgTypeArg ) import Unique ( Unique, Uniquable(..) ) diff --git a/ghc/compiler/ghci/InteractiveUI.hs b/ghc/compiler/ghci/InteractiveUI.hs index d8f291c..f74285c 100644 --- a/ghc/compiler/ghci/InteractiveUI.hs +++ b/ghc/compiler/ghci/InteractiveUI.hs @@ -1,6 +1,6 @@ {-# OPTIONS -#include "Linker.h" #-} ----------------------------------------------------------------------------- --- $Id: InteractiveUI.hs,v 1.155 2003/07/02 14:59:07 simonpj Exp $ +-- $Id: InteractiveUI.hs,v 1.156 2003/07/02 19:41:43 ross Exp $ -- -- GHC Interactive User Interface -- @@ -45,8 +45,8 @@ import Panic hiding ( showException ) import Config #ifndef mingw32_HOST_OS -import System.Posix import DriverUtil( handle ) +import System.Posix #if __GLASGOW_HASKELL__ > 504 hiding (getEnv) #endif