From d256e14b001f547ea56adf764435cfa08bc44f2e Mon Sep 17 00:00:00 2001 From: Daniel Gröber Date: Sat, 30 Nov 2013 20:42:49 +0100 Subject: Fix compiling with base version < 4.6.0 Before base-4.6 catch was in Prelude which is conflicting with the import of Control.Exception.catch --- src/Data/ByteString/Base32/Internal.hs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Data/ByteString/Base32/Internal.hs b/src/Data/ByteString/Base32/Internal.hs index 78b1146..aa7c5b3 100644 --- a/src/Data/ByteString/Base32/Internal.hs +++ b/src/Data/ByteString/Base32/Internal.hs @@ -8,7 +8,7 @@ -- (Word5 <-> Word8) and (Word8 -> Word5) bytestring packers using -- lookup table. -- -{-# LANGUAGE BangPatterns #-} +{-# LANGUAGE CPP, BangPatterns #-} module Data.ByteString.Base32.Internal ( Word5 , Word8 @@ -22,6 +22,9 @@ module Data.ByteString.Base32.Internal , invIx ) where +#if !MIN_VERSION_base(4,6,0) +import Prelude hiding (catch) +#endif import Control.Exception hiding (mask) import Data.Bits.Extras import Data.ByteString as BS -- cgit v1.2.3