zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-02-17 17:11:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Renamed AlignedAlloc.

Browse source 
according to Travis error logs these AlignedAlloc lines were causing compile errors, presumably AlignedAlloc was defined to aligned_alloc, so better use different names.
This commit is contained in:
Christoph Oelckers 2019-11-24 10:42:18 +01:00
parent bff22bbd81
commit 354d5eb66e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/rendering/swrenderer/r_memory.cpp
View file

@ -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);
}