[commit: bytestring] ghc-head: Follow changes in base (9692aaf)

Ian Lynagh igloo at earth.li
Sat Feb 16 18:21:05 CET 2013


Repository : ssh://darcs.haskell.org//srv/darcs/packages/bytestring

On branch  : ghc-head

http://hackage.haskell.org/trac/ghc/changeset/9692aaf0bf9b203f9249a1414637328fd31fc04a

>---------------------------------------------------------------

commit 9692aaf0bf9b203f9249a1414637328fd31fc04a
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sat Feb 16 13:31:08 2013 +0000

    Follow changes in base

>---------------------------------------------------------------

 Data/ByteString/Builder/Internal.hs             |    4 ++++
 Data/ByteString/Builder/Prim.hs                 |    4 ++++
 Data/ByteString/Builder/Prim/Internal/Base16.hs |    4 ++++
 3 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/Data/ByteString/Builder/Internal.hs b/Data/ByteString/Builder/Internal.hs
index 264ae38..4c3e1fc 100644
--- a/Data/ByteString/Builder/Internal.hs
+++ b/Data/ByteString/Builder/Internal.hs
@@ -133,7 +133,11 @@ import qualified Data.ByteString.Lazy as L
 import System.IO (Handle)
 
 #if MIN_VERSION_base(4,4,0)
+#if MIN_VERSION_base(4,7,0)
+import Foreign
+#else
 import Foreign hiding (unsafePerformIO, unsafeForeignPtrToPtr)
+#endif
 import Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr)
 import System.IO.Unsafe (unsafePerformIO)
 #else
diff --git a/Data/ByteString/Builder/Prim.hs b/Data/ByteString/Builder/Prim.hs
index c968959..3e9f20a 100644
--- a/Data/ByteString/Builder/Prim.hs
+++ b/Data/ByteString/Builder/Prim.hs
@@ -464,7 +464,11 @@ import           Data.ByteString.Builder.Prim.Binary
 import           Data.ByteString.Builder.Prim.ASCII
 
 #if MIN_VERSION_base(4,4,0)
+#if MIN_VERSION_base(4,7,0)
+import           Foreign
+#else
 import           Foreign hiding (unsafePerformIO, unsafeForeignPtrToPtr)
+#endif
 import           Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr)
 import           System.IO.Unsafe (unsafePerformIO)
 #else
diff --git a/Data/ByteString/Builder/Prim/Internal/Base16.hs b/Data/ByteString/Builder/Prim/Internal/Base16.hs
index 9fbb59b..7e41f44 100644
--- a/Data/ByteString/Builder/Prim/Internal/Base16.hs
+++ b/Data/ByteString/Builder/Prim/Internal/Base16.hs
@@ -28,7 +28,11 @@ import qualified Data.ByteString          as S
 import qualified Data.ByteString.Internal as S
 
 #if MIN_VERSION_base(4,4,0)
+#if MIN_VERSION_base(4,7,0)
+import           Foreign
+#else
 import           Foreign hiding (unsafePerformIO, unsafeForeignPtrToPtr)
+#endif
 import           Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr)
 import           System.IO.Unsafe (unsafePerformIO)
 #else





More information about the ghc-commits mailing list