mirror/VulkanMemoryAllocator
1
0
Fork 0
mirror of https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git synced 2024-11-26 08:34:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21 from shoikeda/vma-null-undeclared-identifier

Browse Source 
Fix undeclared identifier for Apple.
This commit is contained in:
Adam Sawicki 2018-03-05 10:51:52 +01:00 committed by GitHub
commit 9d17bc513b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/vk_mem_alloc.h
View File

@ -1839,6 +1839,11 @@ remove them if not needed.
#include <malloc.h> // for aligned_alloc() #include <malloc.h> // for aligned_alloc()
#endif #endif
#ifndef VMA_NULL
// Value used as null pointer. Define it to e.g.: nullptr, NULL, 0, (void*)0.
#define VMA_NULL nullptr
#endif
#if defined(__APPLE__) #if defined(__APPLE__)
#include <cstdlib> #include <cstdlib>
void *aligned_alloc(size_t alignment, size_t size) void *aligned_alloc(size_t alignment, size_t size)
@ -1875,11 +1880,6 @@ void *aligned_alloc(size_t alignment, size_t size)
#endif #endif
#endif #endif
#ifndef VMA_NULL
// Value used as null pointer. Define it to e.g.: nullptr, NULL, 0, (void*)0.
#define VMA_NULL nullptr
#endif
#ifndef VMA_ALIGN_OF #ifndef VMA_ALIGN_OF
#define VMA_ALIGN_OF(type) (__alignof(type)) #define VMA_ALIGN_OF(type) (__alignof(type))
#endif #endif