X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnNames.lhs;h=8ae1e5375e38b4b5b70ae39d9b84c85ba83a6e1b;hb=ac80e0dececb68ed6385e3b34765fd8f9c019767;hp=5b426fedf1d70732d373a173e443ad471b80080a;hpb=43d5a248f604acf6ad4d743ed7c002580c44aa8f;p=ghc-hetmet.git

diff --git a/ghc/compiler/rename/RnNames.lhs b/ghc/compiler/rename/RnNames.lhs
index 5b426fe..8ae1e53 100644
--- a/ghc/compiler/rename/RnNames.lhs
+++ b/ghc/compiler/rename/RnNames.lhs
@@ -38,9 +38,9 @@ import HscTypes		( GenAvailInfo(..), AvailInfo, GhciMode(..),
 			  IfaceExport, HomePackageTable, PackageIfaceTable, 
 			  availNames, unQualInScope, 
 			  Deprecs(..), ModIface(..), Dependencies(..), 
-			  lookupIface, ExternalPackageState(..),
-			  IfacePackage(..)
+			  lookupIface, ExternalPackageState(..)
 			)
+import Packages		( PackageIdH(..) )
 import RdrName		( RdrName, rdrNameOcc, setRdrNameSpace, 
 		  	  GlobalRdrEnv, mkGlobalRdrEnv, GlobalRdrElt(..), 
 			  emptyGlobalRdrEnv, plusGlobalRdrEnv, globalRdrEnvElts,
@@ -199,7 +199,7 @@ importsFromImportDecl this_mod
 
 	(dependent_mods, dependent_pkgs) 
 	   = case mi_package iface of
-		ThisPackage ->
+		HomePackage ->
 	    	-- Imported module is from the home package
 		-- Take its dependent modules and add imp_mod itself
 		-- Take its dependent packages unchanged
@@ -213,7 +213,7 @@ importsFromImportDecl this_mod
 		-- check.  See LoadIface.loadHiBootInterface
 		  ((imp_mod_name, want_boot) : dep_mods deps, dep_pkgs deps)
 
-		ExternalPackage pkg ->
+		ExtPackage pkg ->
  	   	-- Imported module is from another package
 		-- Dump the dependent modules
 		-- Add the package imp_mod comes from to the dependent packages