Merge pull request #28 from jbeich/bsd

Unbreak on BSDs
This commit is contained in:
Adam Sawicki 2018-06-04 14:06:36 +02:00 committed by GitHub
commit 606cb27e6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2229,10 +2229,6 @@ remove them if not needed.
#include <mutex> // for std::mutex #include <mutex> // for std::mutex
#include <atomic> // for std::atomic #include <atomic> // for std::atomic
#if !defined(_WIN32) && !defined(__APPLE__)
#include <malloc.h> // for aligned_alloc()
#endif
#ifndef VMA_NULL #ifndef VMA_NULL
// Value used as null pointer. Define it to e.g.: nullptr, NULL, 0, (void*)0. // Value used as null pointer. Define it to e.g.: nullptr, NULL, 0, (void*)0.
#define VMA_NULL nullptr #define VMA_NULL nullptr