projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
40ecf8e
)
__GLASGOW_HASKELL__ >= 609 is now always true
author
Ian Lynagh
<igloo@earth.li>
Thu, 15 Jul 2010 14:15:44 +0000
(14:15 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Thu, 15 Jul 2010 14:15:44 +0000
(14:15 +0000)
utils/ghc-pkg/Main.hs
patch
|
blob
|
history
diff --git
a/utils/ghc-pkg/Main.hs
b/utils/ghc-pkg/Main.hs
index
e110cb4
..
12eaaba
100644
(file)
--- 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
#include "../../includes/ghcconfig.h"
import System.Console.GetOpt
-#if __GLASGOW_HASKELL__ >= 609
import qualified Control.Exception as Exception
import qualified Control.Exception as Exception
-#else
-import qualified Control.Exception.Extensible as Exception
-#endif
import Data.Maybe
import Data.Char ( isSpace, toLower )
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 <-
-- as any exceptions etc will only be able to report the
-- fd currently
h <-
-#if __GLASGOW_HASKELL__ >= 609
fdToHandle fd
fdToHandle fd
-#else
- fdToHandle (fromIntegral fd)
-#endif
`Exception.onException` c_close fd
return (filepath, h)
where
`Exception.onException` c_close fd
return (filepath, h)
where