From 1dbe588497cd5738b5f856d261283eabc89b624c Mon Sep 17 00:00:00 2001 From: hallgren Date: Mon, 16 Feb 2015 15:41:38 +0000 Subject: [PATCH] Restore compatibility with ghc-7.4 With ghc-7.4 'import M hiding (x)' causes an error if M does not export x... --- src/binary/Data/Binary/Builder.hs | 2 ++ src/runtime/haskell/PGF/Tokenizer.hs | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/binary/Data/Binary/Builder.hs b/src/binary/Data/Binary/Builder.hs index bc172d976..03531daa7 100644 --- a/src/binary/Data/Binary/Builder.hs +++ b/src/binary/Data/Binary/Builder.hs @@ -54,7 +54,9 @@ module Data.Binary.Builder ( ) where +#if MIN_VERSION_base(4,8,0) import Prelude hiding (empty) +#endif import Foreign(Word,Word8,Ptr,Storable,ForeignPtr,withForeignPtr,poke,plusPtr,sizeOf) import System.IO.Unsafe(unsafePerformIO) import Data.Monoid diff --git a/src/runtime/haskell/PGF/Tokenizer.hs b/src/runtime/haskell/PGF/Tokenizer.hs index 2fa6bcd48..6b8800c57 100644 --- a/src/runtime/haskell/PGF/Tokenizer.hs +++ b/src/runtime/haskell/PGF/Tokenizer.hs @@ -5,11 +5,14 @@ In this module are implemented function that build a fst-based tokenizer from a Concrete grammar. -} +{-# LANGUAGE CPP #-} module PGF.Tokenizer ( mkTokenizer ) where +#if MIN_VERSION_base(4,8,0) import Prelude hiding ((<*>)) +#endif --import Data.List (intercalate) --import Test.QuickCheck import FST.TransducerInterface