X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fmain%2FHscTypes.lhs;h=ffb66eed5924256b314d898514b8fedcdf6861fc;hp=6b1d05397ddc42119448cb177de0b67414edaa93;hb=4c6a3f787abcaed009a574196d82237d9ae64fc8;hpb=9ee6397787a1400c63e3d807de5996ca6ee9ecc8

diff --git a/compiler/main/HscTypes.lhs b/compiler/main/HscTypes.lhs
index 6b1d053..ffb66ee 100644
--- a/compiler/main/HscTypes.lhs
+++ b/compiler/main/HscTypes.lhs
@@ -106,13 +106,13 @@ import BasicTypes	( Version, initialVersion, IPName,
 import IfaceSyn
 import FiniteMap	( FiniteMap )
 import CoreSyn		( CoreRule )
-import Maybes		( orElse, expectJust, catMaybes, seqMaybe )
+import Maybes		( orElse, expectJust, catMaybes )
 import Outputable
 import BreakArray
 import SrcLoc		( SrcSpan, Located )
-import UniqFM		( lookupUFM, eltsUFM, emptyUFM )
+import LazyUniqFM		( lookupUFM, eltsUFM, emptyUFM )
 import UniqSupply	( UniqSupply )
-import FastString	( FastString )
+import FastString
 import StringBuffer	( StringBuffer )
 
 import System.FilePath
@@ -120,6 +120,7 @@ import System.Time	( ClockTime )
 import Data.IORef
 import Data.Array       ( Array, array )
 import Data.List
+import Control.Monad    ( mplus )
 \end{code}
 
 
@@ -277,7 +278,7 @@ lookupIfaceByModule dflags hpt pit mod
 	-- in the HPT.  If it's not from the home package it's wrong to look
 	-- in the HPT, because the HPT is indexed by *ModuleName* not Module
     fmap hm_iface (lookupUFM hpt (moduleName mod)) 
-    `seqMaybe` lookupModuleEnv pit mod
+    `mplus` lookupModuleEnv pit mod
 
   | otherwise = lookupModuleEnv pit mod		-- Look in PIT only 
 
@@ -628,9 +629,6 @@ data ForeignStubs = NoStubs
                                       	-- 	"foreign exported" functions
 			SDoc 		-- C stubs to use when calling
                                         -- 	"foreign exported" functions
-			[FastString] 	-- Headers that need to be included
-				        -- 	into C code generated for this module
-
 \end{code}
 
 \begin{code}