diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-03-10 15:43:10 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-03-10 15:43:17 -0400 |
| commit | 30cf4d4df7a4fda22e997366731af910f9996c78 (patch) | |
| tree | c0ffb1882ad668df3b6bb0940ceb673ab8dc3003 /Remote | |
| parent | cbe2b256dbe6657dae559896ec2957fbde6595ff (diff) | |
simpler use of MIN_VERSION checks
Diffstat (limited to 'Remote')
| -rw-r--r-- | Remote/WebDAV.hs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Remote/WebDAV.hs b/Remote/WebDAV.hs index 5714cd075..84c30774a 100644 --- a/Remote/WebDAV.hs +++ b/Remote/WebDAV.hs @@ -7,12 +7,6 @@ {-# LANGUAGE ScopedTypeVariables, CPP #-} -#if defined VERSION_http_conduit -#if ! MIN_VERSION_http_conduit(1,9,0) -#define WITH_OLD_HTTP_CONDUIT -#endif -#endif - module Remote.WebDAV (remote, davCreds, setCredsEnv) where import Network.Protocol.HTTP.DAV @@ -234,7 +228,7 @@ davUrlExists :: DavUrl -> DavUser -> DavPass -> IO (Either String Bool) davUrlExists url user pass = decode <$> catchHttp (getProps url user pass) where decode (Right _) = Right True -#ifdef WITH_OLD_HTTP_CONDUIT +#if ! MIN_VERSION_http_conduit(1,9,0) decode (Left (Left (StatusCodeException status _))) #else decode (Left (Left (StatusCodeException status _ _))) @@ -285,7 +279,7 @@ catchHttp a = (Right <$> a) `E.catches` type EitherException = Either HttpException E.IOException showEitherException :: EitherException -> String -#ifdef WITH_OLD_HTTP_CONDUIT +#if ! MIN_VERSION_http_conduit(1,9,0) showEitherException (Left (StatusCodeException status _)) = #else showEitherException (Left (StatusCodeException status _ _)) = |