summaryrefslogtreecommitdiff
path: root/src/binary
diff options
context:
space:
mode:
authorhallgren <hallgren@chalmers.se>2014-03-04 14:28:44 +0000
committerhallgren <hallgren@chalmers.se>2014-03-04 14:28:44 +0000
commit108e04b7bd24271570bb41d192068c18c9d93cce (patch)
treef7253f304e1a8817fef75f50de78b437a2b04b0e /src/binary
parent76ba865c2ed85bdf9de5f936da2e064ce8ed3816 (diff)
Fixes for GHC 7.6 compatibility
Diffstat (limited to 'src/binary')
-rw-r--r--src/binary/Data/Binary/Builder.hs2
-rw-r--r--src/binary/Data/Binary/Get.hs4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/binary/Data/Binary/Builder.hs b/src/binary/Data/Binary/Builder.hs
index 6aee97964..66e2fa497 100644
--- a/src/binary/Data/Binary/Builder.hs
+++ b/src/binary/Data/Binary/Builder.hs
@@ -54,7 +54,7 @@ module Data.Binary.Builder (
) where
-import Foreign
+import Foreign(Word8,Ptr,Storable,ForeignPtr,withForeignPtr,poke,plusPtr,sizeOf)
import System.IO.Unsafe(unsafePerformIO)
import Data.Monoid
--import Data.Word
diff --git a/src/binary/Data/Binary/Get.hs b/src/binary/Data/Binary/Get.hs
index 0a2f12117..719b7d803 100644
--- a/src/binary/Data/Binary/Get.hs
+++ b/src/binary/Data/Binary/Get.hs
@@ -91,8 +91,10 @@ import Foreign
-- used by splitAtST
#if MIN_VERSION_base(4,6,0)
import Control.Monad.ST.Unsafe(unsafeInterleaveST)
+#else
+import Control.Monad.ST(unsafeInterleaveST)
#endif
-import Control.Monad.ST
+import Control.Monad.ST(runST)
import Data.STRef
#if defined(__GLASGOW_HASKELL__) && !defined(__HADDOCK__)