[commit: bytestring] master: CPP-conditional LANGUAGE pragmas now work since ghc-7.0.x (381b1ad)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/381b1ad9f93239627408b955d5943dbb4931fb04

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

commit 381b1ad9f93239627408b955d5943dbb4931fb04
Author: Duncan Coutts <duncan at community.haskell.org>
Date:   Mon Nov 7 11:33:15 2011 +0000

    CPP-conditional LANGUAGE pragmas now work since ghc-7.0.x

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

 Data/ByteString.hs               |    8 ++++----
 Data/ByteString/Char8.hs         |    6 +++---
 Data/ByteString/Internal.hs      |    8 ++++----
 Data/ByteString/Lazy.hs          |    2 +-
 Data/ByteString/Lazy/Internal.hs |    6 +++---
 Data/ByteString/Unsafe.hs        |    6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Data/ByteString.hs b/Data/ByteString.hs
index 08f5cf2..bdadf5b 100644
--- a/Data/ByteString.hs
+++ b/Data/ByteString.hs
@@ -1,8 +1,8 @@
 {-# LANGUAGE CPP #-}
--- We cannot actually specify all the language pragmas, see ghc ticket #
--- If we could, these are what they would be:
-{- LANGUAGE MagicHash, UnboxedTuples,
-            NamedFieldPuns, BangPatterns, RecordWildCards -}
+#if __GLASGOW_HASKELL__
+{-# LANGUAGE MagicHash, UnboxedTuples,
+            NamedFieldPuns, BangPatterns, RecordWildCards #-}
+#endif
 {-# OPTIONS_HADDOCK prune #-}
 #if __GLASGOW_HASKELL__ >= 701
 {-# LANGUAGE Trustworthy #-}
diff --git a/Data/ByteString/Char8.hs b/Data/ByteString/Char8.hs
index 95270db..47704e4 100644
--- a/Data/ByteString/Char8.hs
+++ b/Data/ByteString/Char8.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE CPP #-}
--- We cannot actually specify all the language pragmas, see ghc ticket #
--- If we could, these are what they would be:
-{- LANGUAGE MagicHash, UnboxedTuples -}
+#if __GLASGOW_HASKELL__
+{-# LANGUAGE MagicHash, UnboxedTuples #-}
+#endif
 {-# OPTIONS_HADDOCK prune #-}
 #if __GLASGOW_HASKELL__ >= 701
 {-# LANGUAGE Trustworthy #-}
diff --git a/Data/ByteString/Internal.hs b/Data/ByteString/Internal.hs
index d9a3baf..84b4cfd 100644
--- a/Data/ByteString/Internal.hs
+++ b/Data/ByteString/Internal.hs
@@ -1,8 +1,8 @@
 {-# LANGUAGE CPP, ForeignFunctionInterface, BangPatterns #-}
--- We cannot actually specify all the language pragmas, see ghc ticket #
--- If we could, these are what they would be:
-{- LANGUAGE UnliftedFFITypes, MagicHash,
-            UnboxedTuples, DeriveDataTypeable -}
+#if __GLASGOW_HASKELL__
+{-# LANGUAGE UnliftedFFITypes, MagicHash,
+            UnboxedTuples, DeriveDataTypeable #-}
+#endif
 {-# OPTIONS_HADDOCK hide #-}
 
 -- |
diff --git a/Data/ByteString/Lazy.hs b/Data/ByteString/Lazy.hs
index 32f03d9..a97257a 100644
--- a/Data/ByteString/Lazy.hs
+++ b/Data/ByteString/Lazy.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE CPP #-}
+{-# LANGUAGE CPP, BangPatterns #-}
 {-# OPTIONS_GHC -fno-warn-incomplete-patterns #-}
 {-# OPTIONS_HADDOCK prune #-}
 #if __GLASGOW_HASKELL__ >= 701
diff --git a/Data/ByteString/Lazy/Internal.hs b/Data/ByteString/Lazy/Internal.hs
index c3816fb..18f20b2 100644
--- a/Data/ByteString/Lazy/Internal.hs
+++ b/Data/ByteString/Lazy/Internal.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE CPP, ForeignFunctionInterface, BangPatterns #-}
--- We cannot actually specify all the language pragmas, see ghc ticket #
--- If we could, these are what they would be:
-{- LANGUAGE DeriveDataTypeable -}
+#if __GLASGOW_HASKELL__
+{-# LANGUAGE DeriveDataTypeable #-}
+#endif
 {-# OPTIONS_HADDOCK hide #-}
 
 -- |
diff --git a/Data/ByteString/Unsafe.hs b/Data/ByteString/Unsafe.hs
index f69e416..f322f91 100644
--- a/Data/ByteString/Unsafe.hs
+++ b/Data/ByteString/Unsafe.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE CPP #-}
--- We cannot actually specify all the language pragmas, see ghc ticket #
--- If we could, these are what they would be:
-{- LANGUAGE MagicHash -}
+#if __GLASGOW_HASKELL__
+{-# LANGUAGE MagicHash #-}
+#endif
 
 -- |
 -- Module      : Data.ByteString.Unsafe