Windows fixes

diff --git a/Control/Concurrent.hs b/Control/Concurrent.hs
index 6268311..38a08d2 100644 (file)
--- a/Control/Concurrent.hs
+++ b/Control/Concurrent.hs
@@ -470,7 +470,7 @@ withThread io = do
   x <- takeMVar m
   case x of
     Right a -> return a
-    Left e  -> throwIO e
+    Left e  -> throwIO (e :: IOException)
 
 waitFd :: Fd -> CInt -> IO ()
 waitFd fd write = do

diff --git a/GHC/TopHandler.lhs b/GHC/TopHandler.lhs
index 98ce59b..422b8b0 100644 (file)
--- a/GHC/TopHandler.lhs
+++ b/GHC/TopHandler.lhs
@@ -38,6 +38,9 @@ import GHC.Handle
 import GHC.IOBase
 import GHC.Weak
 import Data.Typeable
+#if defined(mingw32_HOST_OS)
+import GHC.ConsoleHandler
+#endif
 
 -- | 'runMainIO' is wrapped around 'Main.main' (or whatever main is
 -- called in the program).  It catches otherwise uncaught exceptions,