Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'cb/curl-use-xmalloc'
author
Junio C Hamano
<gitster@pobox.com>
Wed, 18 Sep 2019 18:50:08 +0000
(11:50 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 18 Sep 2019 18:50:08 +0000
(11:50 -0700)
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
http.h
patch
|
blob
|
history
raw
(from parent 1:
1286667
)
diff --git
a/http.h
b/http.h
index b429f1cf042bbb61e97e41cd1aacb012c4db834e..5e0ad724f92f3c708d2b330bb689f6eef6bb8de4 100644
(file)
--- 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)