diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2013-09-15 23:05:05 +0200 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2013-09-17 09:54:07 +0200 |
| commit | 0f5eae0232a86ec57d841a83e6929361e2751270 (patch) | |
| tree | 7cc7b87fce8238cd9ff6b65fb0c37f515191aa6e /libraries/base/Prelude.hs | |
| parent | 43ece172e7045d5ba633be6193f3e908eaa81f00 (diff) | |
| download | haskell-0f5eae0232a86ec57d841a83e6929361e2751270.tar.gz | |
Constant-fold `__GLASGOW_HASKELL__` CPP conditionals
Now that HUGS and NHC specific code has been removed, this commit "folds"
the now redundant `#if((n)def)`s containing `__GLASGOW_HASKELL__`. This
renders `base` officially GHC only.
This commit also removes redundant `{-# LANGUAGE CPP #-}`.
Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
Diffstat (limited to 'libraries/base/Prelude.hs')
| -rw-r--r-- | libraries/base/Prelude.hs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libraries/base/Prelude.hs b/libraries/base/Prelude.hs index fdfa4fb456..6be784603c 100644 --- a/libraries/base/Prelude.hs +++ b/libraries/base/Prelude.hs @@ -142,7 +142,6 @@ import Data.Either import Data.Maybe import Data.Tuple -#ifdef __GLASGOW_HASKELL__ import GHC.Base import Text.Read import GHC.Enum @@ -150,7 +149,6 @@ import GHC.Num import GHC.Real import GHC.Float import GHC.Show -#endif infixr 0 $! @@ -159,11 +157,7 @@ infixr 0 $! -- | Strict (call-by-value) application, defined in terms of 'seq'. ($!) :: (a -> b) -> a -> b -#ifdef __GLASGOW_HASKELL__ f $! x = let !vx = x in f vx -- see #2273 -#else -f $! x = x `seq` f x -#endif #ifdef __HADDOCK__ -- | The value of @'seq' a b@ is bottom if @a@ is bottom, and otherwise |