From f4e479d39db904b1d45f218feff25a935f9893f2 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 11 Nov 2023 21:51:30 +0100 Subject: [PATCH] move M_Calloc out of the #ifndef BSD etc... block. --- source/common/utility/m_alloc.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/source/common/utility/m_alloc.cpp b/source/common/utility/m_alloc.cpp index 454fde6d13..5884b48e81 100644 --- a/source/common/utility/m_alloc.cpp +++ b/source/common/utility/m_alloc.cpp @@ -78,13 +78,6 @@ void *M_Realloc(void *memblock, size_t size) return block; } -void* M_Calloc(size_t v1, size_t v2) -{ - auto p = M_Malloc(v1 * v2); - memset(p, 0, v1 * v2); - return p; -} - #else void *M_Malloc(size_t size) { @@ -121,6 +114,14 @@ void *M_Realloc(void *memblock, size_t size) return block; } #endif + +void* M_Calloc(size_t v1, size_t v2) +{ + auto p = M_Malloc(v1 * v2); + memset(p, 0, v1 * v2); + return p; +} + #else #ifdef _MSC_VER #include