mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-12-28 00:18:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

GPUOpen: drop bogus include

Browse Source 
GNU libc and musl have aligned_alloc() in <stdlib.h> while on BSDs
<malloc.h> shouldn't be used.

In file included from rpcs3/Emu/RSX/VK/VKMemAlloc.cpp:2:
In file included from rpcs3/../3rdparty/GPUOpen/include/vk_mem_alloc.h:2233:
/usr/include/malloc.h:3:2: error: "<malloc.h> has been replaced by <stdlib.h>"
 #error "<malloc.h> has been replaced by <stdlib.h>"
  ^
This commit is contained in:
Jan Beich 2018-05-23 23:32:09 +00:00 committed by Ivan
parent 0fc67aa2f6
commit c09c792636
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3rdparty/GPUOpen/include/vk_mem_alloc.h vendored
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