SafeHaskell: Even more fixing to work with safe base

8 files changed, 10 insertions, 9 deletions

diff --git a/compiler/ghci/RtClosureInspect.hs b/compiler/ghci/RtClosureInspect.hs
index 0b4d03181f..8e2c92cd37 100644
--- a/compiler/ghci/RtClosureInspect.hs
+++ b/compiler/ghci/RtClosureInspect.hs
@@ -66,7 +66,7 @@ import Data.List
 import qualified Data.Sequence as Seq
 import Data.Monoid
 import Data.Sequence (viewl, ViewL(..))
-import Foreign hiding (unsafePerformIO)
+import Foreign
 import System.IO.Unsafe
 
 ---------------------------------------------
diff --git a/compiler/main/InteractiveEval.hs b/compiler/main/InteractiveEval.hs
index bb5fab6b9f..68685b6556 100644
--- a/compiler/main/InteractiveEval.hs
+++ b/compiler/main/InteractiveEval.hs
@@ -75,13 +75,12 @@ import System.Directory
 import Data.Dynamic
 import Data.List (find)
 import Control.Monad
-import Foreign hiding (unsafePerformIO)
+import Foreign
 import Foreign.C
 import GHC.Exts
 import Data.Array
 import Exception
 import Control.Concurrent
--- import Foreign.StablePtr
 import System.IO
 import System.IO.Unsafe
 
diff --git a/compiler/utils/FastString.lhs b/compiler/utils/FastString.lhs
index 55b115c5cf..062d32d15e 100644
--- a/compiler/utils/FastString.lhs
+++ b/compiler/utils/FastString.lhs
@@ -96,7 +96,7 @@ import FastFunctions
 import Panic
 import Util
 
-import Foreign hiding   ( unsafePerformIO )
+import Foreign
 import Foreign.C
 import GHC.Exts
 import System.IO
diff --git a/compiler/utils/StringBuffer.lhs b/compiler/utils/StringBuffer.lhs
index 5d1bfa6086..1ad4879ef8 100644
--- a/compiler/utils/StringBuffer.lhs
+++ b/compiler/utils/StringBuffer.lhs
@@ -51,6 +51,7 @@ import FastFunctions
 import Foreign
 import System.IO                ( hGetBuf, hFileSize,IOMode(ReadMode), hClose
                                 , Handle, hTell )
+import System.IO.Unsafe         ( unsafePerformIO )
 
 import GHC.Exts
 
diff --git a/ghc/InteractiveUI.hs b/ghc/InteractiveUI.hs
index ecf8095d23..7f95125331 100644
--- a/ghc/InteractiveUI.hs
+++ b/ghc/InteractiveUI.hs
@@ -82,6 +82,7 @@ import System.Environment
 import System.Exit	( exitWith, ExitCode(..) )
 import System.Directory
 import System.IO
+import System.IO.Unsafe ( unsafePerformIO )
 import System.IO.Error
 import Data.Char
 import Data.Array
diff --git a/rts/Prelude.h b/rts/Prelude.h
index e32980e0d0..7b46063356 100644
--- a/rts/Prelude.h
+++ b/rts/Prelude.h
@@ -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_GHCziConcziIO_ensureIOManagerIsRunning_closure);
+PRELUDE_CLOSURE(base_GHCziConcziIOziImp_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_GHCziConcziIO_ensureIOManagerIsRunning_closure)
+#define ensureIOManagerIsRunning_closure DLL_IMPORT_DATA_REF(base_GHCziConcziIOziImp_ensureIOManagerIsRunning_closure)
 #define runHandlers_closure       DLL_IMPORT_DATA_REF(base_GHCziConcziSignal_runHandlers_closure)
 
 #define stackOverflow_closure     DLL_IMPORT_DATA_REF(base_GHCziIOziException_stackOverflow_closure)
diff --git a/rts/posix/Signals.c b/rts/posix/Signals.c
index 9f5bf9f370..5df7034cc2 100644
--- a/rts/posix/Signals.c
+++ b/rts/posix/Signals.c
@@ -149,7 +149,7 @@ Capability *
 ioManagerStartCap (Capability *cap)
 {
     return rts_evalIO(
-        cap,&base_GHCziConcziIO_ensureIOManagerIsRunning_closure,NULL);
+        cap,&base_GHCziConcziIOziImp_ensureIOManagerIsRunning_closure,NULL);
 }
 
 void
diff --git a/rts/win32/ThrIOManager.c b/rts/win32/ThrIOManager.c
index f48b20387e..13c8153770 100644
--- a/rts/win32/ThrIOManager.c
+++ b/rts/win32/ThrIOManager.c
@@ -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_GHCziConcziIO_ensureIOManagerIsRunning_closure,NULL);

+	rts_evalIO(cap,_imp__base_GHCziConcziIOziImp_ensureIOManagerIsRunning_closure,NULL);

 #else

-	rts_evalIO(cap,&base_GHCziConcziIO_ensureIOManagerIsRunning_closure,NULL);

+	rts_evalIO(cap,&base_GHCziConcziIOziImp_ensureIOManagerIsRunning_closure,NULL);

 #endif

 	rts_unlock(cap);

     }