[commit: ghc] master: Remove redundant CPP conditionals (b292720)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b292720c0635fc934424efead8c8f77168e8eac3/ghc

>---------------------------------------------------------------

commit b292720c0635fc934424efead8c8f77168e8eac3
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Dec 7 22:50:44 2015 +0100

    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.


>---------------------------------------------------------------

b292720c0635fc934424efead8c8f77168e8eac3
 ghc/GhciMonad.hs     | 4 ----
 ghc/InteractiveUI.hs | 5 -----
 2 files changed, 9 deletions(-)

diff --git a/ghc/GhciMonad.hs b/ghc/GhciMonad.hs
index 7dd005b..28c5657 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 f7b3603..24e3c99 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