Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Added CPP directives to avoid warnings.

Browse source 
For 'import Prelude hiding (catch)'.  catch is no longer in
Prelude starting with base 4.6.
This commit is contained in:
John MacFarlane 2013-05-29 09:11:01 -07:00
parent b664068221
commit 7998587810
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Text/Pandoc/UTF8.hs
View file

@ -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

3
src/Text/Pandoc/Writers/EPUB.hs
View file

@ -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)