7998587 · typeable/pandoc

git.iko.soy/typeable/pandoc

Added CPP directives to avoid warnings.

For 'import Prelude hiding (catch)'. catch is no longer in Prelude starting with base 4.6.

commit7998587810cea2db2970a544b316bad7932eae38 authorJohn MacFarlane <fiddlosopher@gmail.com> dateWed 29 May 2013, 09:11 (13 years ago) parentb664068

2 files changed+7

unifiedsplit

src/Text/Pandoc/UTF8.hs+4

@@ -47,8 +47,12 @@ where

4747

4848import System.IO hiding (readFile, writeFile, getContents,

4949 putStr, putStrLn, hPutStr, hPutStrLn, hGetContents)

50+#if MIN_VERSION_base(4,6,0)

51+import Prelude hiding (readFile, writeFile, getContents, putStr, putStrLn)

52+#else

5053import Prelude hiding (readFile, writeFile, getContents, putStr, putStrLn,

5154 catch)

55+#endif

5256import qualified System.IO as IO

5357import qualified Data.ByteString.Char8 as B

5458import qualified Data.ByteString.Lazy as BL

src/Text/Pandoc/Writers/EPUB.hs+3

@@ -56,7 +56,10 @@ import Text.Pandoc.Writers.Markdown ( writePlain )

5656import Data.Char ( toLower )

5757import Network.URI ( isAbsoluteURI, unEscapeString )

5858import Text.Pandoc.MIME (getMimeType)

59+#if MIN_VERSION_base(4,6,0)

60+#else

5961import Prelude hiding (catch)

62+#endif

6063import Control.Exception (catch, SomeException)

6164#if MIN_VERSION_blaze_html(0,5,0)

6265import Text.Blaze.Html.Renderer.Utf8 (renderHtml)