summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@gmail.com>2015-01-18 16:34:42 -0600
committerRyan Houdek <Sonicadvance1@gmail.com>2015-01-18 16:34:42 -0600
commit08e50ec6dda9434e1ea804237d4c1de4f0e26438 (patch)
tree1f9ab484b86a79281b2e0edc3898a3c41c663774 /Source
parent37a770bb9f23404cbdc75e8cc2df31dfecb97057 (diff)
[Android] Remove posix_memalign workaround.
Google fixed the issue of posix_memalign not being available. It now works fine in r10d of the NDK.
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Common/MemoryUtil.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/Source/Core/Common/MemoryUtil.cpp b/Source/Core/Common/MemoryUtil.cpp
index e36babb03d..14d58aa45f 100644
--- a/Source/Core/Common/MemoryUtil.cpp
+++ b/Source/Core/Common/MemoryUtil.cpp
@@ -115,13 +115,9 @@ void* AllocateAlignedMemory(size_t size,size_t alignment)
void* ptr = _aligned_malloc(size,alignment);
#else
void* ptr = nullptr;
-#ifdef ANDROID
- ptr = memalign(alignment, size);
-#else
if (posix_memalign(&ptr, alignment, size) != 0)
ERROR_LOG(MEMMAP, "Failed to allocate aligned memory");
#endif
-#endif
// printf("Mapped memory at %p (size %ld)\n", ptr,
// (unsigned long)size);