summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Rosenthal <jrosenthal@jhu.edu>2016-09-03 08:35:25 -0400
committerJesse Rosenthal <jrosenthal@jhu.edu>2016-09-03 08:41:00 -0400
commit3f82471355286d33f2d73329c29a51c47bf76ad7 (patch)
treec0f719c9ef0c6b754335f6088b54e66db816486e
parent7d9f2d36570b9a910853985251079f0aa032cc9e (diff)
Remove http-client CPP conditionals.
Our lower bound on http-client is 0.5, and both of these min_version tests are less than 0.5, so they will always pass.
-rw-r--r--src/Text/Pandoc/Shared.hs11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/Text/Pandoc/Shared.hs b/src/Text/Pandoc/Shared.hs
index 3f8ead5d2..04752a194 100644
--- a/src/Text/Pandoc/Shared.hs
+++ b/src/Text/Pandoc/Shared.hs
@@ -152,16 +152,7 @@ import Paths_pandoc (getDataFileName)
#ifdef HTTP_CLIENT
import Network.HTTP.Client (httpLbs, responseBody, responseHeaders,
Request(port,host))
-#if MIN_VERSION_http_client(0,4,30)
-import Network.HTTP.Client (parseRequest)
-#else
-import Network.HTTP.Client (parseUrl)
-#endif
-#if MIN_VERSION_http_client(0,4,18)
-import Network.HTTP.Client (newManager)
-#else
-import Network.HTTP.Client (withManager)
-#endif
+import Network.HTTP.Client (parseRequest, newManager)
import Network.HTTP.Client.Internal (addProxy)
import Network.HTTP.Client.TLS (tlsManagerSettings)
import System.Environment (getEnv)