mirror of
https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
synced 2024-11-05 04:10:06 +00:00
Removed #include <malloc.h> for aligned_alloc(). Based on #28 by @jbeich
This commit is contained in:
parent
6a0a85a5c0
commit
083532cf3a
@ -2257,10 +2257,6 @@ remove them if not needed.
|
||||
#include <mutex> // for std::mutex
|
||||
#include <atomic> // for std::atomic
|
||||
|
||||
#if !defined(_WIN32) && !defined(__APPLE__)
|
||||
#include <malloc.h> // for aligned_alloc()
|
||||
#endif
|
||||
|
||||
#ifndef VMA_NULL
|
||||
// Value used as null pointer. Define it to e.g.: nullptr, NULL, 0, (void*)0.
|
||||
#define VMA_NULL nullptr
|
||||
@ -2283,6 +2279,11 @@ void *aligned_alloc(size_t alignment, size_t size)
|
||||
}
|
||||
#endif
|
||||
|
||||
// If your compiler is not compatible with C++11 and definition of
|
||||
// aligned_alloc() function is missing, uncommeting following line may help:
|
||||
|
||||
//#include <malloc.h>
|
||||
|
||||
// Normal assert to check for programmer's errors, especially in Debug configuration.
|
||||
#ifndef VMA_ASSERT
|
||||
#ifdef _DEBUG
|
||||
|
Loading…
Reference in New Issue
Block a user