[commit: packages/bytestring] master: Fix build for ghc 6.12 (87c994d)

git at git.haskell.org git at git.haskell.org
Fri Mar 20 19:36:39 UTC 2015


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

On branch  : master
Link       : http://git.haskell.org/packages/bytestring.git/commitdiff/87c994d8f2d5d9db9f6ad164243bd2870d2bb999

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

commit 87c994d8f2d5d9db9f6ad164243bd2870d2bb999
Author: Duncan Coutts <duncan at community.haskell.org>
Date:   Fri Mar 20 16:45:19 2015 +0000

    Fix build for ghc 6.12


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

87c994d8f2d5d9db9f6ad164243bd2870d2bb999
 Data/ByteString/Short/Internal.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Data/ByteString/Short/Internal.hs b/Data/ByteString/Short/Internal.hs
index 01630ef..6c0bf20 100644
--- a/Data/ByteString/Short/Internal.hs
+++ b/Data/ByteString/Short/Internal.hs
@@ -108,7 +108,7 @@ import Prelude ( Eq(..), Ord(..), Ordering(..), Read(..), Show(..)
 --
 data ShortByteString = SBS ByteArray#
 #if !(MIN_VERSION_base(4,3,0))
-                           Int  -- ^ Prior to ghc-7.0.x, 'ByteArray#'s reported
+           {-# UNPACK #-} !Int  -- ^ Prior to ghc-7.0.x, 'ByteArray#'s reported
                                 -- their length rounded up to the nearest word.
                                 -- This means we have to store the true length
                                 -- separately, wasting a word.
@@ -137,7 +137,7 @@ instance Monoid ShortByteString where
     mconcat = concat
 
 instance NFData ShortByteString where
-    rnf (SBS !_) = ()
+    rnf (SBS {}) = ()
 
 instance Show ShortByteString where
     showsPrec p ps r = showsPrec p (unpackChars ps) r



More information about the ghc-commits mailing list