Merge git://git2.kernel.org/pub/scm/gitk/gitk

diff --git a/http.h b/http.h
index 9ca16acec25e3925c36bbade09b2cb7b4aa07842..324fcf4f5482dc67c3f68df0be30fb0aa210401e 100644 (file)
--- a/http.h
+++ b/http.h
@@ -18,10 +18,14 @@
 #define curl_global_init(a) do { /* nothing */ } while(0)
 #endif
 
-#if LIBCURL_VERSION_NUM < 0x070c04
+#if (LIBCURL_VERSION_NUM < 0x070c04) || (LIBCURL_VERSION_NUM == 0x071000)
 #define NO_CURL_EASY_DUPHANDLE
 #endif
 
+#if LIBCURL_VERSION_NUM < 0x070a03
+#define CURLE_HTTP_RETURNED_ERROR CURLE_HTTP_NOT_FOUND
+#endif
+
 struct slot_results
 {
        CURLcode curl_result;