From c09c79263658ffd7fb201df307adfb0b5d7ac970 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Wed, 23 May 2018 23:32:09 +0000 Subject: [PATCH] GPUOpen: drop bogus include GNU libc and musl have aligned_alloc() in while on BSDs 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: " has been replaced by " #error " has been replaced by " ^ --- 3rdparty/GPUOpen/include/vk_mem_alloc.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/3rdparty/GPUOpen/include/vk_mem_alloc.h b/3rdparty/GPUOpen/include/vk_mem_alloc.h index ce2972c048..0ab7e90503 100644 --- a/3rdparty/GPUOpen/include/vk_mem_alloc.h +++ b/3rdparty/GPUOpen/include/vk_mem_alloc.h @@ -2229,10 +2229,6 @@ remove them if not needed. #include // for std::mutex #include // for std::atomic -#if !defined(_WIN32) && !defined(__APPLE__) - #include // 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