From 3a456e16a86b7e8415180eb3cf263a088b753022 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 3 Nov 2012 12:10:01 -0400
Subject: switch to new URI version by default, -DWITH_OLD_URI for old

---
 Utility/Url.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Utility/Url.hs')

diff --git a/Utility/Url.hs b/Utility/Url.hs
index 2f5cb27c2..4e152159a 100644
--- a/Utility/Url.hs
+++ b/Utility/Url.hs
@@ -119,10 +119,10 @@ request url headers requesttype = go 5 url
 					Nothing -> return rsp
 					Just newURI -> go n newURI_abs
 						where
-#ifdef URI_24
-							newURI_abs = newURI `relativeTo` u
-#else
+#ifdef WITH_OLD_URI
 							newURI_abs = fromMaybe newURI (newURI `relativeTo` u)
+#else
+							newURI_abs = newURI `relativeTo` u
 #endif
 		addheaders req = setHeaders req (rqHeaders req ++ userheaders)
 		userheaders = rights $ map parseHeader headers
-- 
cgit v1.2.3