aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2009-12-31 16:48:55 +0000
committerfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2009-12-31 16:48:55 +0000
commit957f4b95247a304974ce0ffcc8cbb87b1a923236 (patch)
tree710ac11ee5f9c843d547c4f440862ba2e8a13057 /src
parent9c54354cd74dd960c3a6b5c920e52dce89c4f2fe (diff)
downloadpandoc-957f4b95247a304974ce0ffcc8cbb87b1a923236.tar.gz
Added needed imports from System.IO when we're using ghc >= 6.12.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1754 788f1e2b-df1e-0410-8736-df70ead52e1b
Diffstat (limited to 'src')
-rw-r--r--src/markdown2pdf.hs2
-rw-r--r--src/pandoc.hs3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/markdown2pdf.hs b/src/markdown2pdf.hs
index dc8421b28..1092cbe6b 100644
--- a/src/markdown2pdf.hs
+++ b/src/markdown2pdf.hs
@@ -12,11 +12,11 @@ import System.Environment ( getArgs, getProgName )
-- Note: ghc >= 6.12 (base >=4.2) supports unicode through iconv
-- So we use System.IO.UTF8 only if we have an earlier version
#if MIN_VERSION_base(4,2,0)
+import System.IO (hPutStrLn)
#else
import Prelude hiding ( putStr, putStrLn, writeFile, readFile, getContents )
import System.IO.UTF8
#endif
-import System.IO (hPutStrLn)
import System.Exit (ExitCode (..), exitWith)
import System.FilePath
import System.Directory
diff --git a/src/pandoc.hs b/src/pandoc.hs
index 6718dd30b..e85553141 100644
--- a/src/pandoc.hs
+++ b/src/pandoc.hs
@@ -44,10 +44,11 @@ import System.Console.GetOpt
import Data.Maybe ( fromMaybe )
import Data.Char ( toLower )
import Data.List ( intercalate, isSuffixOf )
-import System.IO ( stdout, stderr, hPutStrLn, hPutStr )
+import System.IO ( stdout, stderr )
-- Note: ghc >= 6.12 (base >=4.2) supports unicode through iconv
-- So we use System.IO.UTF8 only if we have an earlier version
#if MIN_VERSION_base(4,2,0)
+import System.IO ( hPutStr, hPutStrLn )
#else
import Prelude hiding ( putStr, putStrLn, writeFile, readFile, getContents )
import System.IO.UTF8