summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhallgren <hallgren@chalmers.se>2015-02-16 15:41:38 +0000
committerhallgren <hallgren@chalmers.se>2015-02-16 15:41:38 +0000
commit956b721048d589d0901d9c70ebbf859e54d09f31 (patch)
treeff559d53d0879512aa5e2d0bf61a849b58f79391 /src
parent54ae70a81e338fd05397ab22890b3ca36284be54 (diff)
Restore compatibility with ghc-7.4
With ghc-7.4 'import M hiding (x)' causes an error if M does not export x...
Diffstat (limited to 'src')
-rw-r--r--src/binary/Data/Binary/Builder.hs2
-rw-r--r--src/runtime/haskell/PGF/Tokenizer.hs3
2 files changed, 5 insertions, 0 deletions
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