Fix OS X compile again

This commit is contained in:
AJR 2016-01-02 10:09:06 -05:00
parent 3e6c0d3434
commit 17e4505c7c

View File

@ -87,13 +87,16 @@ extern const zeromem_t zeromem;
#ifndef NO_MEM_TRACKING
// re-route classic malloc-style allocations
#undef malloc
#undef realloc
#undef free
#define malloc(x) malloc_file_line(x, __FILE__, __LINE__, true, false, false)
#define realloc(x,y) __error_realloc_is_dangerous__
#define free(x) free_file_line(x, __FILE__, __LINE__, true)
#if !defined(__APPLE__) // avoid conflicts with some 3rd-party #includes
#undef realloc
#define realloc(x,y) __error_realloc_is_dangerous__
#endif
#if !defined(_MSC_VER) || _MSC_VER < 1900 // < VS2015
#undef calloc
#define calloc(x,y) __error_use_auto_alloc_clear_or_global_alloc_clear_instead__