diff options
author | Daniel Gröber <dxld@darkboxed.org> | 2013-11-30 20:42:49 +0100 |
---|---|---|
committer | Daniel Gröber <dxld@darkboxed.org> | 2013-11-30 20:46:14 +0100 |
commit | d256e14b001f547ea56adf764435cfa08bc44f2e (patch) | |
tree | 7ca05b1cc2ee17a965eb4c97a95a6561353b7a51 | |
parent | 2618e7c32eed127320a18705ab07aebc076f4cea (diff) |
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
-rw-r--r-- | src/Data/ByteString/Base32/Internal.hs | 5 |
1 files changed, 4 insertions, 1 deletions
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 @@ | |||
8 | -- (Word5 <-> Word8) and (Word8 -> Word5) bytestring packers using | 8 | -- (Word5 <-> Word8) and (Word8 -> Word5) bytestring packers using |
9 | -- lookup table. | 9 | -- lookup table. |
10 | -- | 10 | -- |
11 | {-# LANGUAGE BangPatterns #-} | 11 | {-# LANGUAGE CPP, BangPatterns #-} |
12 | module Data.ByteString.Base32.Internal | 12 | module Data.ByteString.Base32.Internal |
13 | ( Word5 | 13 | ( Word5 |
14 | , Word8 | 14 | , Word8 |
@@ -22,6 +22,9 @@ module Data.ByteString.Base32.Internal | |||
22 | , invIx | 22 | , invIx |
23 | ) where | 23 | ) where |
24 | 24 | ||
25 | #if !MIN_VERSION_base(4,6,0) | ||
26 | import Prelude hiding (catch) | ||
27 | #endif | ||
25 | import Control.Exception hiding (mask) | 28 | import Control.Exception hiding (mask) |
26 | import Data.Bits.Extras | 29 | import Data.Bits.Extras |
27 | import Data.ByteString as BS | 30 | import Data.ByteString as BS |