diff --git a/include/mujoco/mjsan.h b/include/mujoco/mjsan.h index db00fb91..880dc88b 100644 --- a/include/mujoco/mjsan.h +++ b/include/mujoco/mjsan.h @@ -17,8 +17,12 @@ // Define ADDRESS_SANITIZER if implied by other macros. #if !defined(ADDRESS_SANITIZER) - #if defined(__SANITIZE_ADDRESS__) || (defined(__has_feature) && __has_feature(address_sanitizer)) + #if defined(__SANITIZE_ADDRESS__) #define ADDRESS_SANITIZER + #elif defined(__has_feature) + #if __has_feature(address_sanitizer) + #define ADDRESS_SANITIZER + #endif #endif #endif diff --git a/src/engine/engine_crossplatform.h b/src/engine/engine_crossplatform.h index 2fcebefc..ee9ad61c 100644 --- a/src/engine/engine_crossplatform.h +++ b/src/engine/engine_crossplatform.h @@ -60,8 +60,12 @@ // Define ADDRESS_SANITIZER if implied by other macros. #if !defined(ADDRESS_SANITIZER) - #if defined(__SANITIZE_ADDRESS__) || (defined(__has_feature) && __has_feature(address_sanitizer)) + #if defined(__SANITIZE_ADDRESS__) #define ADDRESS_SANITIZER + #elif defined(__has_feature) + #if __has_feature(address_sanitizer) + #define ADDRESS_SANITIZER + #endif #endif #endif