diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2015-12-07 22:50:44 +0100 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2015-12-07 22:52:38 +0100 |
| commit | b292720c0635fc934424efead8c8f77168e8eac3 (patch) | |
| tree | 969686da1bd31e36f3c9bb51d6190ddf39798a09 | |
| parent | 09333313f32be975faf9158fcd3648489d78ad82 (diff) | |
| download | haskell-b292720c0635fc934424efead8c8f77168e8eac3.tar.gz | |
Remove redundant CPP conditionals
It makes little sense to have __GLASGOW_HASKELL__ conditional
code inside GHCi's source-code, as GHCi is only ever build
by the current stage1 GHC, whose version is assumed to be the
same as the GHCi version being built.
| -rw-r--r-- | ghc/GhciMonad.hs | 4 | ||||
| -rw-r--r-- | ghc/InteractiveUI.hs | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/ghc/GhciMonad.hs b/ghc/GhciMonad.hs index 7dd005b99e..28c5657d77 100644 --- a/ghc/GhciMonad.hs +++ b/ghc/GhciMonad.hs @@ -55,10 +55,6 @@ import qualified System.Console.Haskeline as Haskeline import Control.Monad.Trans.Class import Control.Monad.IO.Class -#if __GLASGOW_HASKELL__ < 709 -import Control.Applicative (Applicative(..)) -#endif - ----------------------------------------------------------------------------- -- GHCi monad diff --git a/ghc/InteractiveUI.hs b/ghc/InteractiveUI.hs index f7b3603b6a..24e3c99eb4 100644 --- a/ghc/InteractiveUI.hs +++ b/ghc/InteractiveUI.hs @@ -82,12 +82,7 @@ import Data.List ( find, group, intercalate, intersperse, isPrefixOf, nub, import Data.Maybe import Exception hiding (catch) - -#if __GLASGOW_HASKELL__ >= 709 import Foreign -#else -import Foreign.Safe -#endif import System.Directory import System.Environment |