From 54ae70a81e338fd05397ab22890b3ca36284be54 Mon Sep 17 00:00:00 2001 From: hallgren Date: Mon, 16 Feb 2015 15:05:06 +0000 Subject: Changes for compatibility with ghc-7.10-rc2 2 modules: Name clashes caused by Applicative-Monad change in Prelude 2 modules: Ambiguities caused by Foldable/Traversable in Prelude 2 modules: Backwards incompatible changes in time-1.5 for defaultTimeLocale 9 modules: {-# LANGUAGE FlexibleContexts #-} (because GHC checks inferred types now, in addition to explicitly given type signatures) Also silenced warnings about tab characters in source files. --- src/binary/Data/Binary/Builder.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/binary') diff --git a/src/binary/Data/Binary/Builder.hs b/src/binary/Data/Binary/Builder.hs index 18b45763c..bc172d976 100644 --- a/src/binary/Data/Binary/Builder.hs +++ b/src/binary/Data/Binary/Builder.hs @@ -54,6 +54,7 @@ module Data.Binary.Builder ( ) where +import Prelude hiding (empty) import Foreign(Word,Word8,Ptr,Storable,ForeignPtr,withForeignPtr,poke,plusPtr,sizeOf) import System.IO.Unsafe(unsafePerformIO) import Data.Monoid @@ -71,7 +72,7 @@ import qualified Data.ByteString.Internal as S #endif #if defined(__GLASGOW_HASKELL__) && !defined(__HADDOCK__) -import GHC.Base +import GHC.Base(Int(..),uncheckedShiftRL# ) import GHC.Word (Word32(..),Word16(..),Word64(..)) #if WORD_SIZE_IN_BITS < 64 && __GLASGOW_HASKELL__ >= 608 -- cgit v1.2.3