summaryrefslogtreecommitdiff
path: root/lib/curl_memory.h
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2016-04-01 13:14:57 +0200
committerDaniel Stenberg <daniel@haxx.se>2016-04-01 13:14:57 +0200
commit7db9782dd692c01da2135bf7e466c6804d399b1a (patch)
tree644af13effbd3eafd5424d49c37b2fea81bb80ba /lib/curl_memory.h
parent55452ebdff47f98bf3cc383f1dfc3623fcaefefd (diff)
downloadcurl-7db9782dd692c01da2135bf7e466c6804d399b1a.tar.gz
curl.h: define CURL_DID_MEMORY_FUNC_TYPEDEFS
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 7218b52c49aeb1 Thanks-to: Steve Holme
Diffstat (limited to 'lib/curl_memory.h')
-rw-r--r--lib/curl_memory.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/curl_memory.h b/lib/curl_memory.h
index 637b24d9f..df26a203c 100644
--- a/lib/curl_memory.h
+++ b/lib/curl_memory.h
@@ -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;