Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-25 01:40:16 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "Fix OS X compile again"

Browse Source 
This reverts commit 17e4505c7c.
This commit is contained in:
AJR 2016-01-02 17:07:11 -05:00
parent 17e4505c7c
commit 6b443c5877
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib/util/corealloc.h
View File

@ -87,15 +87,12 @@ extern const zeromem_t zeromem;
#ifndef NO_MEM_TRACKING #ifndef NO_MEM_TRACKING
// re-route classic malloc-style allocations // re-route classic malloc-style allocations
#undef malloc #undef malloc
#undef realloc
#undef free #undef free
#define malloc(x) malloc_file_line(x, __FILE__, __LINE__, true, false, false) #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__ #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 #if !defined(_MSC_VER) || _MSC_VER < 1900 // < VS2015
#undef calloc #undef calloc