Commit a9a1d303 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

includes: avoid duplicate memory callback typdefs even harder

parent ab493af7

include/curl/curl.h

+2 −0
Original line number Diff line number Diff line
@@ -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 {

lib/curl_memory.h

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +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);

#define CURL_DID_MEMORY_FUNC_TYPEDEFS

#endif



extern curl_malloc_callback Curl_cmalloc;