From b22ed9f237b7cfb5f425ba1ceb92e7279502dfb6 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Thu, 11 Jun 2020 16:59:40 +0000 Subject: [PATCH] Fix startup crash on DragonFly BSD --- src/common/utility/m_alloc.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/utility/m_alloc.cpp b/src/common/utility/m_alloc.cpp index 8ab7b6fcc..5c2ea25b9 100644 --- a/src/common/utility/m_alloc.cpp +++ b/src/common/utility/m_alloc.cpp @@ -54,7 +54,7 @@ #endif #ifndef _DEBUG -#if !defined(__solaris__) && !defined(__OpenBSD__) +#if !defined(__solaris__) && !defined(__OpenBSD__) && !defined(__DragonFly__) void *M_Malloc(size_t size) { void *block = malloc(size); @@ -124,7 +124,7 @@ void *M_Realloc(void *memblock, size_t size) #include #endif -#if !defined(__solaris__) && !defined(__OpenBSD__) +#if !defined(__solaris__) && !defined(__OpenBSD__) && !defined(__DragonFly__) void *M_Malloc_Dbg(size_t size, const char *file, int lineno) { void *block = _malloc_dbg(size, _NORMAL_BLOCK, file, lineno); @@ -192,7 +192,7 @@ void *M_Realloc_Dbg(void *memblock, size_t size, const char *file, int lineno) #endif #endif -#if !defined(__solaris__) && !defined(__OpenBSD__) +#if !defined(__solaris__) && !defined(__OpenBSD__) && !defined(__DragonFly__) void M_Free (void *block) { if (block != NULL)