[commit: ghc] ghc-8.0: TyCoRep: Restore compatibility with GHC 7.8 (d6adfaa)

git at git.haskell.org git at git.haskell.org
Mon Jan 25 15:57:11 UTC 2016


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

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/d6adfaaa7333b0ba47d27756d228905a46ec96ca/ghc

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

commit d6adfaaa7333b0ba47d27756d228905a46ec96ca
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sat Jan 23 18:00:38 2016 +0100

    TyCoRep: Restore compatibility with GHC 7.8
    
    MIN_VERSION_GLASGOW_HASKELL was only introduced in 7.10.


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

d6adfaaa7333b0ba47d27756d228905a46ec96ca
 compiler/types/TyCoRep.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/types/TyCoRep.hs b/compiler/types/TyCoRep.hs
index 1522464..4a92bdf 100644
--- a/compiler/types/TyCoRep.hs
+++ b/compiler/types/TyCoRep.hs
@@ -151,7 +151,7 @@ import UniqFM
 import qualified Data.Data as Data hiding ( TyCon )
 import Data.List
 import Data.IORef ( IORef )   -- for CoercionHole
-#if MIN_VERSION_GLASGOW_HASKELL(7,10,2,0)
+#if __GLASGOW_HASKELL__ > 710
 import GHC.Stack (CallStack)
 #endif
 
@@ -1821,7 +1821,7 @@ isValidTCvSubst (TCvSubst in_scope tenv cenv) =
 
 substTy ::
 -- CallStack wasn't present in GHC 7.10.1, disable callstacks in stage 1
-#if MIN_VERSION_GLASGOW_HASKELL(7,10,2,0)
+#if __GLASGOW_HASKELL__ > 710
     (?callStack :: CallStack) =>
 #endif
     TCvSubst -> Type  -> Type



More information about the ghc-commits mailing list