Skip to content

Fix strict C11 compilation of mjsan.h #3514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sylvesterkaczmarek wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −6
Open

Fix strict C11 compilation of mjsan.h #3514

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions include/mujoco/mjsan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,17 @@ extern "C" {
#endif

void mj__markStack(mjData*) __attribute__((noinline));
static inline void mj_markStack(mjData* d) __attribute__((always_inline)) {
asm volatile("" ::: "memory");
__attribute__((always_inline)) static inline void mj_markStack(mjData* d) {
__asm__ volatile("" ::: "memory");
mj__markStack(d);
asm volatile("" ::: "memory");
__asm__ volatile("" ::: "memory");
}

void mj__freeStack(mjData*) __attribute__((noinline));
static inline void mj_freeStack(mjData* d) __attribute__((always_inline)) {
asm volatile("" ::: "memory");
__attribute__((always_inline)) static inline void mj_freeStack(mjData* d) {
__asm__ volatile("" ::: "memory");
mj__freeStack(d);
asm volatile("" ::: "memory");
__asm__ volatile("" ::: "memory");
}

#ifdef __cplusplus
Expand Down