romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-24 17:07:16 +03:00
Code Issues Projects Releases Packages Wiki Activity

curl.h: define CURL_DID_MEMORY_FUNC_TYPEDEFS

Browse source 
So that we only do the extra typedefs in curl_memory.h when we really
need to and avoid double typedefs.

follow-up commit to 7218b52c49

Thanks-to: Steve Holme
This commit is contained in:
Daniel Stenberg 2016-04-01 13:14:57 +02:00
parent 55452ebdff
commit 7db9782dd6
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/curl_memory.h
View file

@ -83,6 +83,7 @@
#ifndef CURLX_NO_MEMORY_CALLBACKS
#ifndef CURL_DID_MEMORY_FUNC_TYPEDEFS /* only if not already done */
/*
* The following memory funciton replacement typedef's are COPIED from
* curl/curl.h and MUST match the originals. We copy them to avoid having to
@ -94,7 +95,7 @@ typedef void (*curl_free_callback)(void *ptr);
typedef void *(*curl_realloc_callback)(void *ptr, size_t size);
typedef char *(*curl_strdup_callback)(const char *str);
typedef void *(*curl_calloc_callback)(size_t nmemb, size_t size);
#endif
extern curl_malloc_callback Curl_cmalloc;
extern curl_free_callback Curl_cfree;