chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove legacy MacOS support in mju_alignedMalloc. As of MuJoCo 2.3.7, MacOS 11 is the oldest supported version of MacOS.

Browse Source 
PiperOrigin-RevId: 555090388
Change-Id: I57d7abf17952da250f1165f24dfcbb112aea92f9
This commit is contained in:
Kyle Bayes
2023-08-09 01:57:16 -07:00
committed by Copybara-Service
parent 631b16e7ad
commit 93012bf164
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/engine_util_errmem.c
-10
View File
@@ -14,7 +14,6 @@
#include "engine/engine_util_errmem.h" #include "engine/engine_util_errmem.h"
#include <errno.h>
#include <stddef.h> #include <stddef.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -33,15 +32,6 @@
static inline void* mju_alignedMalloc(size_t size, size_t align) { static inline void* mju_alignedMalloc(size_t size, size_t align) {
#ifdef _WIN32 #ifdef _WIN32
return _aligned_malloc(size, align); 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 #elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
return aligned_alloc(align, size); return aligned_alloc(align, size);
#endif #endif