aboutsummaryrefslogtreecommitdiffstats
path: root/http.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-04 00:37:40 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-04 00:37:40 -0700
commitf444e5286ee8986adb0899f85cc292fc2cd7cd04 (patch)
tree13c607b5e7bbecea55ba7d1cde51c66b2d8562b4 /http.h
parent182c5afa6c00eb8b773fc062bfd2c29f27ea546b (diff)
downloadgit-f444e5286ee8986adb0899f85cc292fc2cd7cd04.tar.gz
Work around gcc warnings from curl headers
After master.k.org upgrade, I started seeing these warning messages: transport.c: In function 'get_refs_via_curl': transport.c:458: error: call to '_curl_easy_setopt_err_write_callback' declared with attribute warning: curl_easy_setopt expects a curl_write_callback argument for this option It appears that the curl header wants to enforce the function signature for callback function given to curl_easy_setopt() to be compatible with that of (*curl_write_callback) or fwrite. This patch seems to work the issue around. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'http.h')
-rw-r--r--http.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/http.h b/http.h
index a04fc6a927..905b4629a4 100644
--- a/http.h
+++ b/http.h
@@ -64,12 +64,9 @@ struct buffer
};
/* Curl request read/write callbacks */
-extern size_t fread_buffer(void *ptr, size_t eltsize, size_t nmemb,
- struct buffer *buffer);
-extern size_t fwrite_buffer(const void *ptr, size_t eltsize,
- size_t nmemb, struct strbuf *buffer);
-extern size_t fwrite_null(const void *ptr, size_t eltsize,
- size_t nmemb, struct strbuf *buffer);
+extern size_t fread_buffer(void *ptr, size_t eltsize, size_t nmemb, void *strbuf);
+extern size_t fwrite_buffer(const void *ptr, size_t eltsize, size_t nmemb, void *strbuf);
+extern size_t fwrite_null(const void *ptr, size_t eltsize, size_t nmemb, void *strbuf);
/* Slot lifecycle functions */
extern struct active_request_slot *get_active_slot(void);