[commit: packages/bytestring] master: CPP-guard hiding of catch from Prelude (969f079)

[git at git.haskell.org]

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

On branch  : master
Link       : http://git.haskell.org/packages/bytestring.git/commitdiff/969f0797e2455ddc03c10123ff21ea2dbe578e01

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

commit 969f0797e2455ddc03c10123ff21ea2dbe578e01
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Feb 8 19:17:54 2017 -0500

    CPP-guard hiding of catch from Prelude
    
    Prelude no longer exports catch, resulting in a warning which kills the GHC
    build due to -Werror.


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

969f0797e2455ddc03c10123ff21ea2dbe578e01
 Data/ByteString.hs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Data/ByteString.hs b/Data/ByteString.hs
index d23ffb6..79b96d5 100644
--- a/Data/ByteString.hs
+++ b/Data/ByteString.hs
@@ -217,7 +217,11 @@ import Prelude hiding           (reverse,head,tail,last,init,null
                                 ,scanl,scanl1,scanr,scanr1
                                 ,readFile,writeFile,appendFile,replicate
                                 ,getContents,getLine,putStr,putStrLn,interact
-                                ,zip,zipWith,unzip,notElem,catch)
+                                ,zip,zipWith,unzip,notElem
+#if !MIN_VERSION_base(4,6,0)
+                                ,catch
+#endif
+                                )
 
 #if MIN_VERSION_base(4,7,0)
 import Data.Bits                (finiteBitSize, shiftL, (.|.), (.&.))