Skip to content

Commit a2e524e

Browse files
committed
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
2 parents 1286667 + 93b980e commit a2e524e

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

http.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,12 @@
2525
#if LIBCURL_VERSION_NUM < 0x070704
2626
#define curl_global_cleanup() do { /* nothing */ } while (0)
2727
#endif
28+
2829
#if LIBCURL_VERSION_NUM < 0x070800
2930
#define curl_global_init(a) do { /* nothing */ } while (0)
31+
#elif LIBCURL_VERSION_NUM >= 0x070c00
32+
#define curl_global_init(a) curl_global_init_mem(a, xmalloc, free, \
33+
xrealloc, xstrdup, xcalloc)
3034
#endif
3135

3236
#if (LIBCURL_VERSION_NUM < 0x070c04) || (LIBCURL_VERSION_NUM == 0x071000)

0 commit comments

Comments
 (0)