From c75233a8422a44760c4ca3c693aca230cb8e8396 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sat, 23 Nov 2019 11:17:34 +0200 Subject: [PATCH] - avoid name clashing with C11 function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit src/rendering/swrenderer/r_memory.cpp:78:14: error: ‘void* aligned_alloc(size_t, size_t)’ was declared ‘extern’ and later ‘static’ [-fpermissive] --- src/rendering/swrenderer/r_memory.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rendering/swrenderer/r_memory.cpp b/src/rendering/swrenderer/r_memory.cpp index dcc56f3bcc..b54b5b6e95 100644 --- a/src/rendering/swrenderer/r_memory.cpp +++ b/src/rendering/swrenderer/r_memory.cpp @@ -75,7 +75,7 @@ void RenderMemory::Clear() } } -static void* aligned_alloc(size_t alignment, size_t size) +static void* AlignedAlloc(size_t alignment, size_t size) { void* ptr; #if defined _MSC_VER @@ -93,7 +93,7 @@ static void* aligned_alloc(size_t alignment, size_t size) return ptr; } -static void aligned_free(void* ptr) +static void AlignedFree(void* ptr) { if (ptr) { @@ -105,11 +105,11 @@ static void aligned_free(void* ptr) } } -RenderMemory::MemoryBlock::MemoryBlock() : Data(static_cast(aligned_alloc(16, BlockSize))), Position(0) +RenderMemory::MemoryBlock::MemoryBlock() : Data(static_cast(AlignedAlloc(16, BlockSize))), Position(0) { } RenderMemory::MemoryBlock::~MemoryBlock() { - aligned_free(Data); + AlignedFree(Data); }