diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2015-01-19 15:36:17 -0600 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2015-01-19 15:36:17 -0600 |
| commit | 7376956c922a33266cc59afb3ff05f8825ac32ba (patch) | |
| tree | 763c528cd2a3869d86ed4424be49d2597011eadc /Source/Core/Common/MemoryUtil.cpp | |
| parent | 7454297820bdc887c646f0b031dbd0fc4a1346a1 (diff) | |
| parent | 08e50ec6dda9434e1ea804237d4c1de4f0e26438 (diff) | |
Merge pull request #1912 from Sonicadvance1/Android_remove_workaround
[Android] Remove posix_memalign workaround.
Diffstat (limited to 'Source/Core/Common/MemoryUtil.cpp')
| -rw-r--r-- | Source/Core/Common/MemoryUtil.cpp | 4 |
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); |