From 3d63f63fb2eb0b18c35baa00b0d21aa19cd7a3c5 Mon Sep 17 00:00:00 2001 From: pkubaj Date: Sun, 5 May 2019 07:28:46 +0200 Subject: [PATCH] Fix build on FreeBSD (#829) On FreeBSD malloc.h is deprecated. is needed for iswalpha. --- src/gamedata/fonts/font.cpp | 1 + src/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gamedata/fonts/font.cpp b/src/gamedata/fonts/font.cpp index c3ea17f25..4e9cef034 100644 --- a/src/gamedata/fonts/font.cpp +++ b/src/gamedata/fonts/font.cpp @@ -35,6 +35,7 @@ // HEADER FILES ------------------------------------------------------------ +#include #include #include #include diff --git a/src/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h b/src/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h index 4cf3b2ba4..b6d6a70a8 100644 --- a/src/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h +++ b/src/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h @@ -2229,7 +2229,7 @@ remove them if not needed. #include // for std::mutex #include // for std::atomic -#if !defined(_WIN32) && !defined(__APPLE__) +#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__FreeBSD__) #include // for aligned_alloc() #endif