diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-06-20 19:30:03 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-06-20 19:30:03 +0000 |
| commit | e761a777f2440ca1b8d8b40848cc5aa30d889ff6 (patch) | |
| tree | b27793ee161d4c49e2aa49d0152b639512d3aa7d /compiler/utils/Panic.lhs | |
| parent | d78ab147ec3d8c3b06b6e922bed4cd9837c9c797 (diff) | |
| download | haskell-e761a777f2440ca1b8d8b40848cc5aa30d889ff6.tar.gz | |
Remove code that isn't used now that we assume that GHC >= 6.4
Diffstat (limited to 'compiler/utils/Panic.lhs')
| -rw-r--r-- | compiler/utils/Panic.lhs | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/compiler/utils/Panic.lhs b/compiler/utils/Panic.lhs index f79ffce783..b8ab86af68 100644 --- a/compiler/utils/Panic.lhs +++ b/compiler/utils/Panic.lhs @@ -31,7 +31,7 @@ import FastTypes import System.Posix.Signals #endif /* mingw32_HOST_OS */ -#if defined(mingw32_HOST_OS) && __GLASGOW_HASKELL__ >= 603 +#if defined(mingw32_HOST_OS) import GHC.ConsoleHandler #endif @@ -116,18 +116,11 @@ showGhcException (Panic s) ++ s ++ "\n\n" ++ "Please report this as a GHC bug: http://www.haskell.org/ghc/reportabug\n") -myMkTyConApp :: TyCon -> [TypeRep] -> TypeRep -#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ < 603 -myMkTyConApp = mkAppTy -#else -myMkTyConApp = mkTyConApp -#endif - ghcExceptionTc :: TyCon ghcExceptionTc = mkTyCon "GhcException" {-# NOINLINE ghcExceptionTc #-} instance Typeable GhcException where - typeOf _ = myMkTyConApp ghcExceptionTc [] + typeOf _ = mkTyConApp ghcExceptionTc [] \end{code} Panics and asserts. @@ -198,7 +191,7 @@ installSignalHandlers = do installHandler sigQUIT (Catch interrupt) Nothing installHandler sigINT (Catch interrupt) Nothing return () -#elif __GLASGOW_HASKELL__ >= 603 +#else -- GHC 6.3+ has support for console events on Windows -- NOTE: running GHCi under a bash shell for some reason requires -- you to press Ctrl-Break rather than Ctrl-C to provoke @@ -210,8 +203,6 @@ installSignalHandlers = do installHandler (Catch sig_handler) return () -#else - return () -- nothing #endif {-# NOINLINE interruptTargetThread #-} |