projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2003-07-21 15:14:18 by ross]
[ghc-hetmet.git]
/
ghc
/
compiler
/
utils
/
Panic.lhs
diff --git
a/ghc/compiler/utils/Panic.lhs
b/ghc/compiler/utils/Panic.lhs
index
f07f7f1
..
170a7a7
100644
(file)
--- a/
ghc/compiler/utils/Panic.lhs
+++ b/
ghc/compiler/utils/Panic.lhs
@@
-16,9
+16,7
@@
module Panic
showException, showGhcException, tryMost,
installSignalHandlers,
showException, showGhcException, tryMost,
installSignalHandlers,
-#if __GLASGOW_HASKELL__ <= 408
- catchJust, ioErrors, throwTo,
-#endif
+ catchJust, tryJust, ioErrors, throwTo,
) where
#include "HsVersions.h"
) where
#include "HsVersions.h"
@@
-27,7
+25,7
@@
module Panic
import Config
import FastTypes
import Config
import FastTypes
-#ifndef mingw32_TARGET_OS
+#ifndef mingw32_HOST_OS
# if __GLASGOW_HASKELL__ > 504
import System.Posix.Signals
# else
# if __GLASGOW_HASKELL__ > 504
import System.Posix.Signals
# else
@@
-35,13
+33,17
@@
import Posix ( Handler(Catch), installHandler, sigINT, sigQUIT )
# endif /* GHC > 504 */
import CONCURRENT ( myThreadId )
# endif /* GHC > 504 */
import CONCURRENT ( myThreadId )
+#endif /* mingw32_HOST_OS */
# if __GLASGOW_HASKELL__ < 500
import EXCEPTION ( raiseInThread )
# else
import EXCEPTION ( throwTo )
# endif /* GHC < 500 */
# if __GLASGOW_HASKELL__ < 500
import EXCEPTION ( raiseInThread )
# else
import EXCEPTION ( throwTo )
# endif /* GHC < 500 */
-#endif /* mingw32_TARGET_OS */
+
+#if __GLASGOW_HASKELL__ > 408
+import EXCEPTION ( catchJust, tryJust, ioErrors )
+#endif
import DYNAMIC
import qualified EXCEPTION as Exception
import DYNAMIC
import qualified EXCEPTION as Exception
@@
-173,6
+175,7
@@
Compatibility stuff:
\begin{code}
#if __GLASGOW_HASKELL__ <= 408
catchJust = Exception.catchIO
\begin{code}
#if __GLASGOW_HASKELL__ <= 408
catchJust = Exception.catchIO
+tryJust = Exception.tryIO
ioErrors = Exception.justIoErrors
throwTo = Exception.raiseInThread
#endif
ioErrors = Exception.justIoErrors
throwTo = Exception.raiseInThread
#endif
@@
-185,7
+188,7
@@
thread.
\begin{code}
installSignalHandlers :: IO ()
installSignalHandlers = do
\begin{code}
installSignalHandlers :: IO ()
installSignalHandlers = do
-#ifndef mingw32_TARGET_OS
+#ifndef mingw32_HOST_OS
main_thread <- myThreadId
let sig_handler = Catch (throwTo main_thread
(Exception.DynException (toDyn Interrupted)))
main_thread <- myThreadId
let sig_handler = Catch (throwTo main_thread
(Exception.DynException (toDyn Interrupted)))