diff options
author | Vas Crabb <vas@vastheman.com> | 2015-07-03 22:31:19 +1000 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2015-07-03 22:31:19 +1000 |
commit | 454895659e02dfa42546ec94f2e2d9243e018e71 (patch) | |
tree | 07eefc3160c70d300d2bbf1102e81698c502b984 /src/osd/modules/lib/osdlib_win32.c | |
parent | f39a3f540bfaa0875aa2b8b4650aed6a5d58cfe4 (diff) |
Don't make malloc replacement incompatible with malloc (nw)
Diffstat (limited to 'src/osd/modules/lib/osdlib_win32.c')
-rw-r--r-- | src/osd/modules/lib/osdlib_win32.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/osd/modules/lib/osdlib_win32.c b/src/osd/modules/lib/osdlib_win32.c index 846d7e859cd..405b067011f 100644 --- a/src/osd/modules/lib/osdlib_win32.c +++ b/src/osd/modules/lib/osdlib_win32.c @@ -112,7 +112,7 @@ int osd_get_num_processors(void) void *osd_malloc(size_t size) { #ifndef MALLOC_DEBUG - return HeapAlloc(GetProcessHeap(), 0, size); + return malloc(size); #else // add in space for the size size += sizeof(size_t); @@ -134,7 +134,7 @@ void *osd_malloc(size_t size) void *osd_malloc_array(size_t size) { #ifndef MALLOC_DEBUG - return HeapAlloc(GetProcessHeap(), 0, size); + return malloc(size); #else // add in space for the size size += sizeof(size_t); @@ -169,7 +169,7 @@ void *osd_malloc_array(size_t size) void osd_free(void *ptr) { #ifndef MALLOC_DEBUG - HeapFree(GetProcessHeap(), 0, ptr); + free(ptr); #else size_t size = reinterpret_cast<size_t *>(ptr)[-1]; |