From a9a1d303f5d8d2d2899c5efffe6360bfc09aa50e Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 18 Apr 2016 15:04:17 +0200 Subject: includes: avoid duplicate memory callback typdefs even harder --- include/curl/curl.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') 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 { -- cgit v1.2.3