From 6b443c58777a56cc9ab0a0dcdb254fd89f021098 Mon Sep 17 00:00:00 2001 From: AJR Date: Sat, 2 Jan 2016 17:07:11 -0500 Subject: [PATCH] Revert "Fix OS X compile again" This reverts commit 17e4505c7cabbe800648b62ffef27a6e49f2039d. --- src/lib/util/corealloc.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/lib/util/corealloc.h b/src/lib/util/corealloc.h index ea33798d909..5cd481824ed 100644 --- a/src/lib/util/corealloc.h +++ b/src/lib/util/corealloc.h @@ -87,15 +87,12 @@ 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 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 +#define free(x) free_file_line(x, __FILE__, __LINE__, true) #if !defined(_MSC_VER) || _MSC_VER < 1900 // < VS2015 #undef calloc