diff options
| author | Stefan Werner <stefan.werner@tangent-animation.com> | 2019-09-13 23:49:26 +0300 |
|---|---|---|
| committer | Stefan Werner <stefan.werner@tangent-animation.com> | 2019-09-13 23:49:26 +0300 |
| commit | c80564ef9f557fadd235b87533b24d126e2138c9 (patch) | |
| tree | 335bdef76913ef91871f111e4a2f7a929c52cd3e /intern/libmv | |
| parent | 57e0e520e89b1de8fec424a2be4f90a59d7557dc (diff) | |
macOS: Enabled posix_memalign() like on other Unix platforms.
Diffstat (limited to 'intern/libmv')
| -rw-r--r-- | intern/libmv/libmv/base/aligned_malloc.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/intern/libmv/libmv/base/aligned_malloc.cc b/intern/libmv/libmv/base/aligned_malloc.cc index cc0a5fbbba7..5d3e05e9df9 100644 --- a/intern/libmv/libmv/base/aligned_malloc.cc +++ b/intern/libmv/libmv/base/aligned_malloc.cc @@ -44,12 +44,7 @@ namespace libmv { void *aligned_malloc(int size, int 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. - CHECK_EQ(alignment, 16); - return malloc(size); -#elif defined(__FreeBSD__) || defined(__NetBSD__) +#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) void *result; if (posix_memalign(&result, alignment, size)) { |