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
This commit is contained in:
commit
a2e524ecf3
4
http.h
4
http.h
@ -25,8 +25,12 @@
|
|||||||
#if LIBCURL_VERSION_NUM < 0x070704
|
#if LIBCURL_VERSION_NUM < 0x070704
|
||||||
#define curl_global_cleanup() do { /* nothing */ } while (0)
|
#define curl_global_cleanup() do { /* nothing */ } while (0)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if LIBCURL_VERSION_NUM < 0x070800
|
#if LIBCURL_VERSION_NUM < 0x070800
|
||||||
#define curl_global_init(a) do { /* nothing */ } while (0)
|
#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
|
#endif
|
||||||
|
|
||||||
#if (LIBCURL_VERSION_NUM < 0x070c04) || (LIBCURL_VERSION_NUM == 0x071000)
|
#if (LIBCURL_VERSION_NUM < 0x070c04) || (LIBCURL_VERSION_NUM == 0x071000)
|
||||||
|
Loading…
Reference in New Issue
Block a user