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/Numeric.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/Numeric.hs')
| -rw-r--r-- | libraries/base/Numeric.hs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libraries/base/Numeric.hs b/libraries/base/Numeric.hs index 3b444e1930..600c82f8ec 100644 --- a/libraries/base/Numeric.hs +++ b/libraries/base/Numeric.hs @@ -1,5 +1,5 @@ {-# LANGUAGE Trustworthy #-} -{-# LANGUAGE CPP, NoImplicitPrelude, MagicHash #-} +{-# LANGUAGE NoImplicitPrelude, MagicHash #-} ----------------------------------------------------------------------------- -- | @@ -57,7 +57,6 @@ module Numeric ( ) where -#ifdef __GLASGOW_HASKELL__ import GHC.Base import GHC.Read import GHC.Real @@ -67,11 +66,7 @@ import GHC.Show import Data.Maybe import Text.ParserCombinators.ReadP( ReadP, readP_to_S, pfail ) import qualified Text.Read.Lex as L -#else -import Data.Char -#endif -#ifdef __GLASGOW_HASKELL__ -- ----------------------------------------------------------------------------- -- Reading @@ -184,7 +179,6 @@ showGFloat :: (RealFloat a) => Maybe Int -> a -> ShowS showEFloat d x = showString (formatRealFloat FFExponent d x) showFFloat d x = showString (formatRealFloat FFFixed d x) showGFloat d x = showString (formatRealFloat FFGeneric d x) -#endif /* __GLASGOW_HASKELL__ */ -- --------------------------------------------------------------------------- -- Integer printing functions |