From 93012bf16420d190fdf2e7bbe59e28d128b302f7 Mon Sep 17 00:00:00 2001 From: Kyle Bayes Date: Wed, 9 Aug 2023 01:57:16 -0700 Subject: [PATCH] Remove legacy MacOS support in mju_alignedMalloc. As of MuJoCo 2.3.7, MacOS 11 is the oldest supported version of MacOS. PiperOrigin-RevId: 555090388 Change-Id: I57d7abf17952da250f1165f24dfcbb112aea92f9 --- src/engine/engine_util_errmem.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/engine/engine_util_errmem.c b/src/engine/engine_util_errmem.c index 125a64d8..9ed469fb 100644 --- a/src/engine/engine_util_errmem.c +++ b/src/engine/engine_util_errmem.c @@ -14,7 +14,6 @@ #include "engine/engine_util_errmem.h" -#include #include #include #include @@ -33,15 +32,6 @@ static inline void* mju_alignedMalloc(size_t size, size_t align) { #ifdef _WIN32 return _aligned_malloc(size, align); -#elif defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L - // Prefer posix_memalign since C11 aligned_alloc isn't available on macOS < 10.15. - void* ptr; - const int err = posix_memalign(&ptr, align, size); - if (err) { - ptr = NULL; - errno = err; - } - return ptr; #elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L return aligned_alloc(align, size); #endif