From ef52c8d507eae812ca52096efd3b46020c4573be Mon Sep 17 00:00:00 2001 From: Stephen Diehl Date: Wed, 13 Apr 2016 16:36:42 -0400 Subject: [PATCH] gracefully handle 7.10 modules if present --- src/Base.hs | 2 ++ src/Protolude.hs | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/src/Base.hs b/src/Base.hs index 791592322..239f25d18 100644 --- a/src/Base.hs +++ b/src/Base.hs @@ -45,7 +45,9 @@ import GHC.Types as X ( , Word , Ordering , IO +#if ( __GLASGOW_HASKELL__ >= 710 ) , Coercible +#endif ) infixr 0 $! diff --git a/src/Protolude.hs b/src/Protolude.hs index 8b01cd3ff..e9d9efb37 100644 --- a/src/Protolude.hs +++ b/src/Protolude.hs @@ -128,10 +128,19 @@ import Data.Set as X (Set) import Data.Sequence as X (Seq) import Data.IntMap as X (IntMap) import Data.IntSet as X (IntSet) + +#if ( __GLASGOW_HASKELL__ >= 710 ) import Data.Proxy as X ( Proxy(..) ) +import Data.Void as X ( + Void + , absurd + , vacuous + ) +#endif + -- Monad transformers import Control.Monad.State as X ( MonadState