From 20381a5929902073a279f3f8bb0b6bb053ed99a4 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Wed, 10 Jun 2020 13:13:07 +0000 Subject: [PATCH] Fix compilation on DragonFly BSD --- src/common/rendering/gl_load/gl_system.h | 2 +- .../rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h | 2 +- src/common/utility/m_alloc.cpp | 2 +- src/common/utility/m_alloc.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/rendering/gl_load/gl_system.h b/src/common/rendering/gl_load/gl_system.h index 0ad2f3303..6b40d73c0 100644 --- a/src/common/rendering/gl_load/gl_system.h +++ b/src/common/rendering/gl_load/gl_system.h @@ -14,7 +14,7 @@ #include #include #include -#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) +#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__) #include #endif #include diff --git a/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h b/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h index 53ce163bf..30f2494a7 100644 --- a/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h +++ b/src/common/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__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) +#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__) #include // for aligned_alloc() #endif diff --git a/src/common/utility/m_alloc.cpp b/src/common/utility/m_alloc.cpp index d1f34c324..8ab7b6fcc 100644 --- a/src/common/utility/m_alloc.cpp +++ b/src/common/utility/m_alloc.cpp @@ -38,7 +38,7 @@ #elif defined(__APPLE__) #include #include -#elif defined(__OpenBSD__) +#elif defined(__OpenBSD__) || defined(__DragonFly__) #include #else #include diff --git a/src/common/utility/m_alloc.h b/src/common/utility/m_alloc.h index 76c4947bc..14e9cbb9a 100644 --- a/src/common/utility/m_alloc.h +++ b/src/common/utility/m_alloc.h @@ -40,7 +40,7 @@ #if defined(__APPLE__) #include #define _msize(p) malloc_size(p) -#elif defined(__solaris__) || defined(__OpenBSD__) +#elif defined(__solaris__) || defined(__OpenBSD__) || defined(__DragonFly__) #define _msize(p) (*((size_t*)(p)-1)) #elif !defined(_WIN32) #include