mirror of
https://github.com/moparisthebest/curl
synced 2024-08-13 17:03:50 -04:00
includes: avoid duplicate memory callback typdefs even harder
This commit is contained in:
parent
ab493af731
commit
a9a1d303f5
@ -373,6 +373,7 @@ typedef curlioerr (*curl_ioctl_callback)(CURL *handle,
|
|||||||
int cmd,
|
int cmd,
|
||||||
void *clientp);
|
void *clientp);
|
||||||
|
|
||||||
|
#ifndef CURL_DID_MEMORY_FUNC_TYPEDEFS
|
||||||
/*
|
/*
|
||||||
* The following typedef's are signatures of malloc, free, realloc, strdup and
|
* The following typedef's are signatures of malloc, free, realloc, strdup and
|
||||||
* calloc respectively. Function pointers of these types can be passed to the
|
* 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);
|
typedef void *(*curl_calloc_callback)(size_t nmemb, size_t size);
|
||||||
|
|
||||||
#define CURL_DID_MEMORY_FUNC_TYPEDEFS
|
#define CURL_DID_MEMORY_FUNC_TYPEDEFS
|
||||||
|
#endif
|
||||||
|
|
||||||
/* the kind of data that is passed to information_callback*/
|
/* the kind of data that is passed to information_callback*/
|
||||||
typedef enum {
|
typedef enum {
|
||||||
|
@ -95,6 +95,7 @@ typedef void (*curl_free_callback)(void *ptr);
|
|||||||
typedef void *(*curl_realloc_callback)(void *ptr, size_t size);
|
typedef void *(*curl_realloc_callback)(void *ptr, size_t size);
|
||||||
typedef char *(*curl_strdup_callback)(const char *str);
|
typedef char *(*curl_strdup_callback)(const char *str);
|
||||||
typedef void *(*curl_calloc_callback)(size_t nmemb, size_t size);
|
typedef void *(*curl_calloc_callback)(size_t nmemb, size_t size);
|
||||||
|
#define CURL_DID_MEMORY_FUNC_TYPEDEFS
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern curl_malloc_callback Curl_cmalloc;
|
extern curl_malloc_callback Curl_cmalloc;
|
||||||
|
Loading…
Reference in New Issue
Block a user