[commit: packages/bytestring] ghc-head: Fix build on GHC 7.0 (176a2e6)

git at git.haskell.org git at git.haskell.org
Thu Aug 29 10:19:06 CEST 2013


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

On branch  : ghc-head
Link       : http://git.haskell.org/?p=packages/bytestring.git;a=commit;h=176a2e6834647a5d64008175aa3db8049b22107b

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

commit 176a2e6834647a5d64008175aa3db8049b22107b
Author: Johan Tibell <johan.tibell at gmail.com>
Date:   Tue Mar 5 16:35:07 2013 -0800

    Fix build on GHC 7.0
    
    unpackCString# was moved from GHC.Base to GHC.CString in 7.2.


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

176a2e6834647a5d64008175aa3db8049b22107b
 Data/ByteString/Internal.hs |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Data/ByteString/Internal.hs b/Data/ByteString/Internal.hs
index 82b6108..79ccd3f 100644
--- a/Data/ByteString/Internal.hs
+++ b/Data/ByteString/Internal.hs
@@ -115,7 +115,11 @@ import Data.Generics            (Data(..), mkNorepType)
 
 #ifdef __GLASGOW_HASKELL__
 import GHC.Base                 (realWorld#,unsafeChr)
+#if MIN_VERSION_base(4,4,0)
 import GHC.CString              (unpackCString#)
+#else
+import GHC.Base                 (unpackCString#)
+#endif
 import GHC.Prim                 (Addr#)
 #if __GLASGOW_HASKELL__ >= 611
 import GHC.IO                   (IO(IO))





More information about the ghc-commits mailing list