X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcForeign.lhs;h=49ecffc357e74e17ed90d8397ff3015e61142710;hb=f6a68d3109f977fe4431df51d1412d916e7c08da;hp=c78b469d8810e5926e62c2acd890b6c22939c068;hpb=e68a891932d615590d9b1ab5752ada8142db5053;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcForeign.lhs b/compiler/typecheck/TcForeign.lhs
index c78b469..49ecffc 100644
--- a/compiler/typecheck/TcForeign.lhs
+++ b/compiler/typecheck/TcForeign.lhs
@@ -34,10 +34,8 @@ import Type
 import SMRep
 import MachOp
 #endif
-import OccName
 import Name
 import TcType
-import ForeignCall
 import DynFlags
 import Outputable
 import SrcLoc
@@ -216,8 +214,7 @@ tcFExport fo@(ForeignExport (L loc nm) hs_ty spec) =
    newUnique			`thenM` \ uniq ->
    getModule			`thenM` \ mod ->
    let
-        gnm  = mkExternalName uniq mod (mkForeignExportOcc (getOccName nm)) 
-			      (srcSpanStart loc)
+        gnm  = mkExternalName uniq mod (mkForeignExportOcc (getOccName nm)) loc
 	id   = mkExportedLocalId gnm sig_ty
 	bind = L loc (VarBind id rhs)
    in
@@ -266,7 +263,7 @@ mustBeIO = False
 
 checkForeignRes non_io_result_ok pred_res_ty ty
 	-- (IO t) is ok, and so is any newtype wrapping thereof
-  | Just (io, res_ty) <- tcSplitIOType_maybe ty,
+  | Just (io, res_ty, _) <- tcSplitIOType_maybe ty,
     pred_res_ty res_ty
   = returnM ()