From 17e4505c7cabbe800648b62ffef27a6e49f2039d Mon Sep 17 00:00:00 2001 From: AJR Date: Sat, 2 Jan 2016 10:09:06 -0500 Subject: [PATCH] Fix OS X compile again --- src/lib/util/corealloc.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/lib/util/corealloc.h b/src/lib/util/corealloc.h index 5cd481824ed..ea33798d909 100644 --- a/src/lib/util/corealloc.h +++ b/src/lib/util/corealloc.h @@ -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__