git-merge: show usage if run without arguments

diff --git a/http.h b/http.h
index d6dc9d89fbc4be0fd5acd3e7bc50302da69f3d05..6e12e416889503553ae502be31b2e9ed9e7dc4dd 100644 (file)
--- a/http.h
+++ b/http.h
@@ -22,6 +22,10 @@
 #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);
@@ -61,6 +66,7 @@ extern struct active_request_slot *get_active_slot(void);
 extern int start_active_slot(struct active_request_slot *slot);
 extern void run_active_slot(struct active_request_slot *slot);
 extern void finish_all_active_slots(void);
+extern void release_active_slot(struct active_request_slot *slot);
 
 #ifdef USE_CURL_MULTI
 extern void fill_active_slots(void);