From 9c6016081f8d26072e00f0fac0105202fa847c6c Mon Sep 17 00:00:00 2001 From: sof Date: Fri, 25 Jul 1997 23:10:39 +0000 Subject: [PATCH] [project @ 1997-07-25 23:10:05 by sof] imports changed --- ghc/compiler/absCSyn/CLabel.lhs | 8 +------- ghc/compiler/absCSyn/PprAbsC.lhs | 3 +-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/ghc/compiler/absCSyn/CLabel.lhs b/ghc/compiler/absCSyn/CLabel.lhs index 7a7c548..814b1d5 100644 --- a/ghc/compiler/absCSyn/CLabel.lhs +++ b/ghc/compiler/absCSyn/CLabel.lhs @@ -48,13 +48,6 @@ module CLabel ( ) where IMP_Ubiq(){-uitous-} -#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201 -IMPORT_DELOOPER(AbsCLoop) ( CtrlReturnConvention(..), - ctrlReturnConvAlg - ) -#else -import {-# SOURCE #-} CgRetConv -#endif #if ! OMIT_NATIVE_CODEGEN @@ -65,6 +58,7 @@ import {-# SOURCE #-} MachMisc ( underscorePrefix, fmtAsmLbl ) # endif #endif +import CgRetConv ( CtrlReturnConvention(..), ctrlReturnConvAlg ) import CStrings ( pp_cSEP ) import Id ( externallyVisibleId, cmpId_withSpecDataCon, isDataCon, isDictFunId, diff --git a/ghc/compiler/absCSyn/PprAbsC.lhs b/ghc/compiler/absCSyn/PprAbsC.lhs index 3454645..23c530b 100644 --- a/ghc/compiler/absCSyn/PprAbsC.lhs +++ b/ghc/compiler/absCSyn/PprAbsC.lhs @@ -31,11 +31,10 @@ import GlaExts (Addr(..)) #if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201 IMPORT_DELOOPER(AbsCLoop) -- break its dependence on ClosureInfo #else -import {-# SOURCE #-} ClosureInfo #endif import AbsCSyn - +import ClosureInfo import AbsCUtils ( getAmodeRep, nonemptyAbsC, mixedPtrLocn, mixedTypeLocn ) -- 1.7.10.4