From c3278a9d3c17ea0929d39116e431a2839bb845ca Mon Sep 17 00:00:00 2001
From: David Waern <david.waern@gmail.com>
Date: Fri, 25 Nov 2011 02:39:26 +0100
Subject: Remove #ifs for older compiler versions.

---
 src/Haddock/GhcUtils.hs                  | 2 --
 src/Haddock/Interface/AttachInstances.hs | 4 ----
 src/Haddock/Interface/Create.hs          | 4 ----
 src/Haddock/InterfaceFile.hs             | 2 --
 src/Haddock/Lex.x                        | 4 ----
 5 files changed, 16 deletions(-)

(limited to 'src/Haddock')

diff --git a/src/Haddock/GhcUtils.hs b/src/Haddock/GhcUtils.hs
index d5423bee..6d170586 100644
--- a/src/Haddock/GhcUtils.hs
+++ b/src/Haddock/GhcUtils.hs
@@ -30,9 +30,7 @@ import Name
 import Packages
 import Module
 import RdrName (GlobalRdrEnv)
-#if MIN_VERSION_ghc(7,1,0)
 import GhcMonad (withSession)
-#endif
 import HscTypes
 import UniqFM
 import GHC
diff --git a/src/Haddock/Interface/AttachInstances.hs b/src/Haddock/Interface/AttachInstances.hs
index 01d5b0f4..5b7771ec 100644
--- a/src/Haddock/Interface/AttachInstances.hs
+++ b/src/Haddock/Interface/AttachInstances.hs
@@ -25,11 +25,7 @@ import GHC
 import Name
 import InstEnv
 import Class
-#if MIN_VERSION_ghc(7,1,0)
 import GhcMonad (withSession)
-#else
-import HscTypes (withSession)
-#endif
 import TysPrim( funTyCon )
 import MonadUtils (liftIO)
 import TcRnDriver (tcRnGetInfo)
diff --git a/src/Haddock/Interface/Create.hs b/src/Haddock/Interface/Create.hs
index caaed13c..155cd938 100644
--- a/src/Haddock/Interface/Create.hs
+++ b/src/Haddock/Interface/Create.hs
@@ -275,11 +275,7 @@ filterOutInstances = filter (\(L _ d, _, _) -> not (isInstD d))
 -- bindings from an 'HsGroup'.
 declsFromGroup :: HsGroup Name -> [Decl]
 declsFromGroup group_ =
-#if MIN_VERSION_ghc(7,0,2)
   mkDecls (concat . hs_tyclds)  TyClD  group_ ++
-#else
-  mkDecls hs_tyclds             TyClD  group_ ++
-#endif
   mkDecls hs_derivds            DerivD group_ ++
   mkDecls hs_defds              DefD   group_ ++
   mkDecls hs_fords              ForD   group_ ++
diff --git a/src/Haddock/InterfaceFile.hs b/src/Haddock/InterfaceFile.hs
index 68bc20b6..64f8baab 100644
--- a/src/Haddock/InterfaceFile.hs
+++ b/src/Haddock/InterfaceFile.hs
@@ -37,9 +37,7 @@ import UniqSupply
 import UniqFM
 import IfaceEnv
 import HscTypes
-#if MIN_VERSION_ghc(7,1,0)
 import GhcMonad (withSession)
-#endif
 import FastMutInt
 import FastString
 import Unique
diff --git a/src/Haddock/Lex.x b/src/Haddock/Lex.x
index e41c9461..153f6677 100644
--- a/src/Haddock/Lex.x
+++ b/src/Haddock/Lex.x
@@ -222,11 +222,7 @@ ident pos str sc cont dflags =
 
 strToHsQNames :: DynFlags -> RealSrcLoc -> String -> Maybe [RdrName]
 strToHsQNames dflags loc str0 = 
-#if MIN_VERSION_ghc(7,1,0)
   let buffer = stringToStringBuffer str0
-#else
-  let buffer = unsafePerformIO (stringToStringBuffer str0)
-#endif
       pstate = mkPState dflags buffer loc
       result = unP parseIdentifier pstate 
   in case result of 
-- 
cgit v1.2.3