From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Sep 2019 18:50:08 +0000 (-0700)
Subject: Merge branch 'cb/curl-use-xmalloc'
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a2e524ecf396722020e85b39d7b5e83d7c95ec24?hp=128666753b449bd76315c8f0a10b752c6a97561f

Merge branch 'cb/curl-use-xmalloc'

Tell cURL library to use the same malloc() implementation, with the
xmalloc() wrapper, as the rest of the system, for consistency.

* cb/curl-use-xmalloc:
http: use xmalloc with cURL
---

diff --git a/http.h b/http.h
index b429f1cf04..5e0ad724f9 100644
--- a/http.h
+++ b/http.h
@@ -25,8 +25,12 @@
 #if LIBCURL_VERSION_NUM < 0x070704
 #define curl_global_cleanup() do { /* nothing */ } while (0)
 #endif
+
 #if LIBCURL_VERSION_NUM < 0x070800
 #define curl_global_init(a) do { /* nothing */ } while (0)
+#elif LIBCURL_VERSION_NUM >= 0x070c00
+#define curl_global_init(a) curl_global_init_mem(a, xmalloc, free, \
+						xrealloc, xstrdup, xcalloc)
 #endif
 
 #if (LIBCURL_VERSION_NUM < 0x070c04) || (LIBCURL_VERSION_NUM == 0x071000)