Commit 4f9675b2 authored by dterei's avatar dterei

SafeHaskell: Fix compilation errors.

parent 7750fc25
......@@ -774,8 +774,9 @@ hscFileFrontEnd :: ModSummary -> Hsc TcGblEnv
hscFileFrontEnd mod_summary = do
rdr_module <- hscParse' mod_summary
hsc_env <- getHscEnv
tcg_env <-
{-# SCC "Typecheck-Rename" #-}
tcg_env <- ioMsgMaybe $
ioMsgMaybe $
tcRnModule hsc_env (ms_hsc_src mod_summary) False rdr_module
dflags <- getDynFlags
-- XXX: See Note [SafeHaskell API]
......
......@@ -44,7 +44,7 @@ PRELUDE_CLOSURE(base_ControlziExceptionziBase_nonTermination_closure);
PRELUDE_CLOSURE(base_ControlziExceptionziBase_nestedAtomically_closure);
PRELUDE_CLOSURE(base_GHCziConcziSyncziImp_runSparks_closure);
PRELUDE_CLOSURE(base_GHCziConcziIOziImp_ensureIOManagerIsRunning_closure);
PRELUDE_CLOSURE(base_GHCziConcziIO_ensureIOManagerIsRunning_closure);
PRELUDE_CLOSURE(base_GHCziConcziSignal_runHandlers_closure);
PRELUDE_INFO(ghczmprim_GHCziTypes_Czh_static_info);
......@@ -89,7 +89,7 @@ PRELUDE_INFO(base_GHCziStableziImp_StablePtr_con_info);
#define mainIO_closure (&ZCMain_main_closure)
#define runSparks_closure DLL_IMPORT_DATA_REF(base_GHCziConcziSyncziImp_runSparks_closure)
#define ensureIOManagerIsRunning_closure DLL_IMPORT_DATA_REF(base_GHCziConcziIOziImp_ensureIOManagerIsRunning_closure)
#define ensureIOManagerIsRunning_closure DLL_IMPORT_DATA_REF(base_GHCziConcziIO_ensureIOManagerIsRunning_closure)
#define runHandlers_closure DLL_IMPORT_DATA_REF(base_GHCziConcziSignal_runHandlers_closure)
#define stackOverflow_closure DLL_IMPORT_DATA_REF(base_GHCziIOziException_stackOverflow_closure)
......
......@@ -149,7 +149,7 @@ Capability *
ioManagerStartCap (Capability *cap)
{
return rts_evalIO(
cap,&base_GHCziConcziIOziImp_ensureIOManagerIsRunning_closure,NULL);
cap,&base_GHCziConcziIO_ensureIOManagerIsRunning_closure,NULL);
}
void
......
......@@ -153,9 +153,9 @@ ioManagerStart (void)
if (io_manager_event == INVALID_HANDLE_VALUE) {
cap = rts_lock();
#if defined(mingw32_HOST_OS) && defined(__PIC__)
rts_evalIO(cap,_imp__base_GHCziConcziIOziImp_ensureIOManagerIsRunning_closure,NULL);
rts_evalIO(cap,_imp__base_GHCziConcziIO_ensureIOManagerIsRunning_closure,NULL);
#else
rts_evalIO(cap,&base_GHCziConcziIOziImp_ensureIOManagerIsRunning_closure,NULL);
rts_evalIO(cap,&base_GHCziConcziIO_ensureIOManagerIsRunning_closure,NULL);
#endif
rts_unlock(cap);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment