[commit: packages/binary] master: [fix] preprocessor errors on clang ghc 7.6.3 (4efc2db)

git at git.haskell.org git at git.haskell.org
Sun Dec 14 17:54:18 UTC 2014


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

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/4efc2db61f9f810de3ff0d9a8775ca005badcf8a

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

commit 4efc2db61f9f810de3ff0d9a8775ca005badcf8a
Author: Lennart Melzer <me at lmaa.name>
Date:   Thu Feb 27 23:35:12 2014 +0100

    [fix] preprocessor errors on clang ghc 7.6.3


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

4efc2db61f9f810de3ff0d9a8775ca005badcf8a
 src/Data/Binary/Builder/Base.hs | 4 +---
 src/Data/Binary/Get.hs          | 3 +--
 src/Data/Binary/Get/Internal.hs | 3 +--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/Data/Binary/Builder/Base.hs b/src/Data/Binary/Builder/Base.hs
index d6bb32a..6dd5b75 100644
--- a/src/Data/Binary/Builder/Base.hs
+++ b/src/Data/Binary/Builder/Base.hs
@@ -508,7 +508,5 @@ shiftr_w64 = shiftR
     append (ensureFree a) (ensureFree b) = ensureFree (max a b)
 
 "flush/flush"
-    append flush flush = flush
-
- #-}
+    append flush flush = flush #-}
 #endif
diff --git a/src/Data/Binary/Get.hs b/src/Data/Binary/Get.hs
index 626c05c..4f8f7b4 100644
--- a/src/Data/Binary/Get.hs
+++ b/src/Data/Binary/Get.hs
@@ -435,8 +435,7 @@ getWord8 = readN 1 B.unsafeHead
 "getWord32be/readN" getWord32be = readN 4 word32be
 "getWord32le/readN" getWord32le = readN 4 word32le
 "getWord64be/readN" getWord64be = readN 8 word64be
-"getWord64le/readN" getWord64le = readN 8 word64le
- #-}
+"getWord64le/readN" getWord64le = readN 8 word64le #-}
 
 -- | Read a Word16 in big endian format
 getWord16be :: Get Word16
diff --git a/src/Data/Binary/Get/Internal.hs b/src/Data/Binary/Get/Internal.hs
index 7dac47d..2f656f1 100644
--- a/src/Data/Binary/Get/Internal.hs
+++ b/src/Data/Binary/Get/Internal.hs
@@ -321,8 +321,7 @@ readN !n f = ensureN n >> unsafeReadN n f
   returnG f = readN 0 (const f)
 
 "readN 0/returnG swapback" [1] forall f.
-  readN 0 f = returnG (f B.empty)
- #-}
+  readN 0 f = returnG (f B.empty) #-}
 
 -- | Ensure that there are at least @n@ bytes available. If not, the
 -- computation will escape with 'Partial'.



More information about the ghc-commits mailing list