[commit: packages/primitive] ghc-head: Fix compilation with GHC 7.6.1 (38ace95)

git at git.haskell.org git at git.haskell.org
Thu Sep 26 11:44:38 CEST 2013


Repository : ssh://git@git.haskell.org/primitive

On branch  : ghc-head
Link       : http://git.haskell.org/packages/primitive.git/commitdiff/38ace95bdf9c2bef071a31a2f06f912cb20e606a

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

commit 38ace95bdf9c2bef071a31a2f06f912cb20e606a
Author: Roman Leshchinskiy <rl at cse.unsw.edu.au>
Date:   Tue Sep 25 14:55:08 2012 -0700

    Fix compilation with GHC 7.6.1


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

38ace95bdf9c2bef071a31a2f06f912cb20e606a
 Data/Primitive/ByteArray.hs |    3 +++
 Data/Primitive/Types.hs     |    3 +++
 2 files changed, 6 insertions(+)

diff --git a/Data/Primitive/ByteArray.hs b/Data/Primitive/ByteArray.hs
index 634d70d..753bf0d 100644
--- a/Data/Primitive/ByteArray.hs
+++ b/Data/Primitive/ByteArray.hs
@@ -41,6 +41,9 @@ import Foreign.C.Types
 import Data.Word ( Word8 )
 import GHC.Base ( Int(..) )
 import GHC.Prim
+#if __GLASGOW_HASKELL__ >= 706
+    hiding (setByteArray#)
+#endif
 
 import Data.Typeable ( Typeable )
 import Data.Data ( Data(..) )
diff --git a/Data/Primitive/Types.hs b/Data/Primitive/Types.hs
index 8d723ad..0e9c385 100644
--- a/Data/Primitive/Types.hs
+++ b/Data/Primitive/Types.hs
@@ -36,6 +36,9 @@ import GHC.Int (
   )
 
 import GHC.Prim
+#if __GLASGOW_HASKELL__ >= 706
+    hiding (setByteArray#)
+#endif
 
 import Data.Typeable ( Typeable )
 import Data.Data ( Data(..) )




More information about the ghc-commits mailing list