Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Werner <stefan.werner@tangent-animation.com>2019-09-13 23:49:26 +0300
committerStefan Werner <stefan.werner@tangent-animation.com>2019-09-13 23:49:26 +0300
commitc80564ef9f557fadd235b87533b24d126e2138c9 (patch)
tree335bdef76913ef91871f111e4a2f7a929c52cd3e /intern/guardedalloc
parent57e0e520e89b1de8fec424a2be4f90a59d7557dc (diff)
macOS: Enabled posix_memalign() like on other Unix platforms.
Diffstat (limited to 'intern/guardedalloc')
-rw-r--r--intern/guardedalloc/intern/mallocn.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c
index 1c96856fd0d..ac970a8c610 100644
--- a/intern/guardedalloc/intern/mallocn.c
+++ b/intern/guardedalloc/intern/mallocn.c
@@ -72,14 +72,7 @@ void *aligned_malloc(size_t size, size_t alignment)
{
#ifdef _WIN32
return _aligned_malloc(size, alignment);
-#elif defined(__APPLE__)
- /* On Mac OS X, both the heap and the stack are guaranteed 16-byte aligned so
- * they work natively with SSE types with no further work.
- */
- assert(alignment == 16);
- (void)alignment;
- return malloc(size);
-#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined (__APPLE__)
void *result;
if (posix_memalign(&result, alignment, size)) {