diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2016-04-01 13:14:57 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2016-04-01 13:14:57 +0200 |
| commit | 7db9782dd692c01da2135bf7e466c6804d399b1a (patch) | |
| tree | 644af13effbd3eafd5424d49c37b2fea81bb80ba /include/curl/curl.h | |
| parent | 55452ebdff47f98bf3cc383f1dfc3623fcaefefd (diff) | |
| download | gnurl-7db9782dd692c01da2135bf7e466c6804d399b1a.tar.gz gnurl-7db9782dd692c01da2135bf7e466c6804d399b1a.tar.bz2 gnurl-7db9782dd692c01da2135bf7e466c6804d399b1a.zip | |
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 'include/curl/curl.h')
| -rw-r--r-- | include/curl/curl.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/curl/curl.h b/include/curl/curl.h index 96ea1f2a0..a81574e1a 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -385,6 +385,8 @@ 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); +#define CURL_DID_MEMORY_FUNC_TYPEDEFS + /* the kind of data that is passed to information_callback*/ typedef enum { CURLINFO_TEXT = 0, |