git rebase --abort: always restore the right commit

[thirdparty/git.git] / http.h

diff --git a/http.h b/http.h
index aeba9301f8fe1a1d4e2f9819257579375be648aa..04169d5f9c8fa4cb82ad720b9e6d371f02be83d3 100644 (file)
--- a/http.h
+++ b/http.h
@@ -7,6 +7,15 @@
 #include <curl/easy.h>
 
 #include "strbuf.h"
+#include "remote.h"
+
+/*
+ * We detect based on the cURL version if multi-transfer is
+ * usable in this implementation and define this symbol accordingly.
+ * This is not something Makefile should set nor users should pass
+ * via CFLAGS.
+ */
+#undef USE_CURL_MULTI
 
 #if LIBCURL_VERSION_NUM >= 0x071000
 #define USE_CURL_MULTI
@@ -75,7 +84,7 @@ extern void add_fill_function(void *data, int (*fill)(void *));
 extern void step_active_slots(void);
 #endif
 
-extern void http_init(void);
+extern void http_init(struct remote *remote);
 extern void http_cleanup(void);
 
 extern int data_received;