diff options
| author | John MacFarlane <fiddlosopher@gmail.com> | 2013-05-29 09:11:01 -0700 |
|---|---|---|
| committer | John MacFarlane <fiddlosopher@gmail.com> | 2013-05-29 20:21:32 -0700 |
| commit | 7998587810cea2db2970a544b316bad7932eae38 (patch) | |
| tree | 4a7dafd1d3501c6a3c7d9b560088a3120575b58a /src/Text/Pandoc | |
| parent | b66406822125364b5fbb66007bd9401163336e7c (diff) | |
| download | pandoc-7998587810cea2db2970a544b316bad7932eae38.tar.gz | |
Added CPP directives to avoid warnings.
For 'import Prelude hiding (catch)'. catch is no longer in
Prelude starting with base 4.6.
Diffstat (limited to 'src/Text/Pandoc')
| -rw-r--r-- | src/Text/Pandoc/UTF8.hs | 4 | ||||
| -rw-r--r-- | src/Text/Pandoc/Writers/EPUB.hs | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/Text/Pandoc/UTF8.hs b/src/Text/Pandoc/UTF8.hs index a6921fc8f..83ce7b30e 100644 --- a/src/Text/Pandoc/UTF8.hs +++ b/src/Text/Pandoc/UTF8.hs @@ -47,8 +47,12 @@ where import System.IO hiding (readFile, writeFile, getContents, putStr, putStrLn, hPutStr, hPutStrLn, hGetContents) +#if MIN_VERSION_base(4,6,0) +import Prelude hiding (readFile, writeFile, getContents, putStr, putStrLn) +#else import Prelude hiding (readFile, writeFile, getContents, putStr, putStrLn, catch) +#endif import qualified System.IO as IO import qualified Data.ByteString.Char8 as B import qualified Data.ByteString.Lazy as BL diff --git a/src/Text/Pandoc/Writers/EPUB.hs b/src/Text/Pandoc/Writers/EPUB.hs index 01318ce00..9af78a338 100644 --- a/src/Text/Pandoc/Writers/EPUB.hs +++ b/src/Text/Pandoc/Writers/EPUB.hs @@ -56,7 +56,10 @@ import Text.Pandoc.Writers.Markdown ( writePlain ) import Data.Char ( toLower ) import Network.URI ( isAbsoluteURI, unEscapeString ) import Text.Pandoc.MIME (getMimeType) +#if MIN_VERSION_base(4,6,0) +#else import Prelude hiding (catch) +#endif import Control.Exception (catch, SomeException) #if MIN_VERSION_blaze_html(0,5,0) import Text.Blaze.Html.Renderer.Utf8 (renderHtml) |