git-diff: fix combined diff

diff --git a/http.h b/http.h
index 36fa154d2f6adf19bac3db4985360174320f0b8d..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;
@@ -35,6 +39,7 @@ struct active_request_slot
        int in_use;
        CURLcode curl_result;
        long http_code;
+       int *finished;
        struct slot_results *results;
        void *callback_data;
        void (*callback_func)(void *data);