From 354d5eb66ee3267249285346965e9415a50e6384 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 24 Nov 2019 10:42:18 +0100
Subject: [PATCH] - Renamed AlignedAlloc.

according to Travis error logs these AlignedAlloc lines were causing compile errors, presumably AlignedAlloc was defined to aligned_alloc, so better use different names.
---
 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 b54b5b6e957..492beb03f48 100644
--- a/src/rendering/swrenderer/r_memory.cpp
+++ b/src/rendering/swrenderer/r_memory.cpp
@@ -75,7 +75,7 @@ void RenderMemory::Clear()
 	}
 }
 
-static void* AlignedAlloc(size_t alignment, size_t size)
+static void* Aligned_Alloc(size_t alignment, size_t size)
 {
 	void* ptr;
 #if defined _MSC_VER
@@ -93,7 +93,7 @@ static void* AlignedAlloc(size_t alignment, size_t size)
 	return ptr;
 }
 
-static void AlignedFree(void* ptr)
+static void Aligned_Free(void* ptr)
 {
 	if (ptr)
 	{
@@ -105,11 +105,11 @@ static void AlignedFree(void* ptr)
 	}
 }
 
-RenderMemory::MemoryBlock::MemoryBlock() : Data(static_cast<uint8_t*>(AlignedAlloc(16, BlockSize))), Position(0)
+RenderMemory::MemoryBlock::MemoryBlock() : Data(static_cast<uint8_t*>(Aligned_Alloc(16, BlockSize))), Position(0)
 {
 }
 
 RenderMemory::MemoryBlock::~MemoryBlock()
 {
-	AlignedFree(Data);
+	Aligned_Free(Data);
 }