diff options
author | Daniel Stenberg <daniel@haxx.se> | 2016-04-18 15:04:17 +0200 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2016-04-18 15:04:17 +0200 |
commit | a9a1d303f5d8d2d2899c5efffe6360bfc09aa50e (patch) | |
tree | c58fac7c1c775ef1cf82f8c4a401ace16ef779a7 /include | |
parent | ab493af731a55ca0c7936f277bfb2a24a1b723d9 (diff) | |
download | curl-a9a1d303f5d8d2d2899c5efffe6360bfc09aa50e.tar.gz |
includes: avoid duplicate memory callback typdefs even harder
Diffstat (limited to 'include')
-rw-r--r-- | include/curl/curl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/curl/curl.h b/include/curl/curl.h index 1df508410..20dd250e8 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -373,6 +373,7 @@ typedef curlioerr (*curl_ioctl_callback)(CURL *handle, int cmd, void *clientp); +#ifndef CURL_DID_MEMORY_FUNC_TYPEDEFS /* * The following typedef's are signatures of malloc, free, realloc, strdup and * calloc respectively. Function pointers of these types can be passed to the @@ -386,6 +387,7 @@ typedef char *(*curl_strdup_callback)(const char *str); typedef void *(*curl_calloc_callback)(size_t nmemb, size_t size); #define CURL_DID_MEMORY_FUNC_TYPEDEFS +#endif /* the kind of data that is passed to information_callback*/ typedef enum { |