From 0368d0a56dd8f9a9ad507d947be9d829a7465178 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Sun, 7 Jul 2024 21:14:04 +0100 Subject: [PATCH] fix: `MP_UNITS_API_CONTRACTS` should have a priority over headers availability (compat_macros) --- src/core/include/mp-units/compat_macros.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/include/mp-units/compat_macros.h b/src/core/include/mp-units/compat_macros.h index c26f94a4..4add3e12 100644 --- a/src/core/include/mp-units/compat_macros.h +++ b/src/core/include/mp-units/compat_macros.h @@ -87,14 +87,14 @@ #endif // MP_UNITS_HOSTED -#if MP_UNITS_API_CONTRACTS == 2 || __has_include() +#if MP_UNITS_API_CONTRACTS == 2 || (!defined MP_UNITS_API_CONTRACTS && __has_include()) #define MP_UNITS_EXPECTS(expr) gsl_Expects(expr) #define MP_UNITS_EXPECTS_DEBUG(expr) gsl_ExpectsDebug(expr) #define MP_UNITS_ASSERT(expr) gsl_Assert(expr) #define MP_UNITS_ASSERT_DEBUG(expr) gsl_AssertDebug(expr) -#elif MP_UNITS_API_CONTRACTS == 3 || __has_include() +#elif MP_UNITS_API_CONTRACTS == 3 || (!defined MP_UNITS_API_CONTRACTS && __has_include()) #define MP_UNITS_EXPECTS(expr) Expects(expr) #if defined NDEBUG