From: Ian Lynagh Date: Thu, 15 Jul 2010 14:15:44 +0000 (+0000) Subject: __GLASGOW_HASKELL__ >= 609 is now always true X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=36b95bfff2e3925be37e1f8ada3914b8d6dfebb6 __GLASGOW_HASKELL__ >= 609 is now always true --- diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs index e110cb4..12eaaba 100644 --- a/utils/ghc-pkg/Main.hs +++ b/utils/ghc-pkg/Main.hs @@ -30,11 +30,7 @@ import Prelude #include "../../includes/ghcconfig.h" import System.Console.GetOpt -#if __GLASGOW_HASKELL__ >= 609 import qualified Control.Exception as Exception -#else -import qualified Control.Exception.Extensible as Exception -#endif import Data.Maybe import Data.Char ( isSpace, toLower ) @@ -1670,11 +1666,7 @@ openNewFile dir template = do -- as any exceptions etc will only be able to report the -- fd currently h <- -#if __GLASGOW_HASKELL__ >= 609 fdToHandle fd -#else - fdToHandle (fromIntegral fd) -#endif `Exception.onException` c_close fd return (filepath, h) where