Fix BUG#23254. Change macro definition of mem_* to allow

passing as function pointers when MEM_LIBC_MALLOC is defined.
This commit is contained in:
kieranm 2008-05-30 11:37:15 +00:00
parent a3bc6cd666
commit 7bc881ccc5
2 changed files with 8 additions and 4 deletions

View File

@ -22,6 +22,10 @@ HISTORY
++ Bugfixes:
2008-05-30 Kieran Mansley
* mem.h: Fix BUG#23254. Change macro definition of mem_* to allow
passing as function pointers when MEM_LIBC_MALLOC is defined.
2008-05-09 Jonathan Larmour
* err.h, err.c, sockets.c: Fix bug #23119: Reorder timeout error code to
stop it being treated as a fatal error.

View File

@ -50,16 +50,16 @@ typedef size_t mem_size_t;
* allow these defines to be overridden.
*/
#ifndef mem_free
#define mem_free(x) free(x)
#define mem_free free
#endif
#ifndef mem_malloc
#define mem_malloc(x) malloc(x)
#define mem_malloc malloc
#endif
#ifndef mem_calloc
#define mem_calloc(x, y) calloc(x, y)
#define mem_calloc calloc
#endif
#ifndef mem_realloc
#define mem_realloc(x, size) (x)
#define mem_realloc realloc
#endif
#else /* MEM_LIBC_MALLOC */