From 4cf3aaecde9705069a46c23dcd19b32e60f9f3f4 Mon Sep 17 00:00:00 2001 From: John MacFarlane <jgm@berkeley.edu> Date: Mon, 25 Jun 2012 14:27:22 -0700 Subject: [PATCH] Test for base 4.4.0 instead of 4.5.0 for argument/filename encoding. --- src/Text/Pandoc/UTF8.hs | 4 ++-- src/pandoc.hs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Text/Pandoc/UTF8.hs b/src/Text/Pandoc/UTF8.hs index 929bc3f89..e2959eae7 100644 --- a/src/Text/Pandoc/UTF8.hs +++ b/src/Text/Pandoc/UTF8.hs @@ -39,7 +39,7 @@ module Text.Pandoc.UTF8 ( readFile where -#if MIN_VERSION_base(4,5,0) +#if MIN_VERSION_base(4,4,0) #else import Codec.Binary.UTF8.String (encodeString) #endif @@ -120,7 +120,7 @@ hPutStrLn h s = hPutStr h (s ++ "\n") #endif encodePath :: FilePath -> FilePath -#if MIN_VERSION_base(4,5,0) +#if MIN_VERSION_base(4,4,0) encodePath = id #else encodePath = encodeString diff --git a/src/pandoc.hs b/src/pandoc.hs index 7e9646c94..0eb64c9ba 100644 --- a/src/pandoc.hs +++ b/src/pandoc.hs @@ -58,13 +58,13 @@ import Network.URI (parseURI, isURI, URI(..)) import qualified Data.ByteString.Lazy as B import Data.ByteString.Lazy.UTF8 (toString ) import Text.CSL.Reference (Reference(..)) -#if MIN_VERSION_base(4,5,0) +#if MIN_VERSION_base(4,4,0) #else import Codec.Binary.UTF8.String (decodeString, encodeString) #endif encodePath, decodeArg :: FilePath -> FilePath -#if MIN_VERSION_base(4,5,0) +#if MIN_VERSION_base(4,4,0) encodePath = id decodeArg = id #else