SafeHaskell: Even more fixing to work with safe base
authorDavid Terei <davidterei@gmail.com>
Tue, 31 May 2011 20:44:04 +0000 (13:44 -0700)
committerDavid Terei <davidterei@gmail.com>
Sat, 18 Jun 2011 03:40:18 +0000 (20:40 -0700)
compiler/ghci/RtClosureInspect.hs
compiler/main/InteractiveEval.hs
compiler/utils/FastString.lhs
compiler/utils/StringBuffer.lhs
ghc/InteractiveUI.hs
rts/Prelude.h
rts/posix/Signals.c
rts/win32/ThrIOManager.c

index 0b4d031..8e2c92c 100644 (file)
@@ -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
 
 ---------------------------------------------
index bb5fab6..68685b6 100644 (file)
@@ -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
 
index 55b115c..062d32d 100644 (file)
@@ -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
index 5d1bfa6..1ad4879 100644 (file)
@@ -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
 
index ecf8095..7f95125 100644 (file)
@@ -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
index e32980e..7b46063 100644 (file)
@@ -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)
index 9f5bf9f..5df7034 100644 (file)
@@ -149,7 +149,7 @@ Capability *
 ioManagerStartCap (Capability *cap)
 {
     return rts_evalIO(
-        cap,&base_GHCziConcziIO_ensureIOManagerIsRunning_closure,NULL);
+        cap,&base_GHCziConcziIOziImp_ensureIOManagerIsRunning_closure,NULL);
 }
 
 void
index f48b203..13c8153 100644 (file)
@@ -153,9 +153,9 @@ ioManagerStart (void)
     if (io_manager_event == INVALID_HANDLE_VALUE) {\r
        cap = rts_lock();\r
 #if defined(mingw32_HOST_OS) && defined(__PIC__)\r
-       rts_evalIO(cap,_imp__base_GHCziConcziIO_ensureIOManagerIsRunning_closure,NULL);\r
+       rts_evalIO(cap,_imp__base_GHCziConcziIOziImp_ensureIOManagerIsRunning_closure,NULL);\r
 #else\r
-       rts_evalIO(cap,&base_GHCziConcziIO_ensureIOManagerIsRunning_closure,NULL);\r
+       rts_evalIO(cap,&base_GHCziConcziIOziImp_ensureIOManagerIsRunning_closure,NULL);\r
 #endif\r
        rts_unlock(cap);\r
     }\r