aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-29 11:36:21 -0800
committerJunio C Hamano <junkio@cox.net>2006-12-29 11:36:21 -0800
commit1ed4813f7d018eb35187209d43b98746a2e69542 (patch)
tree09458f2db889646ff016d11e18dc8b0ab1b7d817
parent4d06f8ac4389ed8bcd2d03b2dcab4b7e2a858402 (diff)
parent500ebb0196e3b14183171b8c492b3f5f9fa0bf02 (diff)
downloadgit-1ed4813f7d018eb35187209d43b98746a2e69542.tar.gz
git-1ed4813f7d018eb35187209d43b98746a2e69542.tar.xz
Merge branch 'jc/curl'
* jc/curl: Work around http-fetch built with cURL 7.16.0
-rw-r--r--http.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/http.h b/http.h
index 6e12e4168..324fcf4f5 100644
--- a/http.h
+++ b/http.h
@@ -18,7 +18,7 @@
#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