diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-07-15 14:25:00 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-07-15 14:25:00 +0000 |
| commit | 59250f18e4bbe425c4ca3850783e592af9fcac96 (patch) | |
| tree | fae6d28234cc51e1eee86060b7d0d6f7f4c58294 /utils | |
| parent | 1d9983e852b11a16b77d549b8acb6ba4abdf6601 (diff) | |
| download | haskell-59250f18e4bbe425c4ca3850783e592af9fcac96.tar.gz | |
Simplify some more CPP __GLASGOW_HASKELL__ tests
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/ghc-pkg/Main.hs | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs index e5398ad33d..00d3681b18 100644 --- a/utils/ghc-pkg/Main.hs +++ b/utils/ghc-pkg/Main.hs @@ -1532,7 +1532,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 @@ -1544,13 +1544,6 @@ installSignalHandlers = do _ <- installHandler (Catch sig_handler) return () -#else - return () -- nothing -#endif - -#if __GLASGOW_HASKELL__ <= 604 -isInfixOf :: (Eq a) => [a] -> [a] -> Bool -isInfixOf needle haystack = any (isPrefixOf needle) (tails haystack) #endif #if mingw32_HOST_OS || mingw32_TARGET_OS @@ -1644,9 +1637,7 @@ openNewFile dir template = do oflags = rw_flags .|. o_EXCL -#if __GLASGOW_HASKELL__ < 611 withFilePath = withCString -#endif findTempName x = do fd <- withFilePath filepath $ \ f -> |