From f500cd29a89ae10961b16bddfecbdc71e493d21b Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sun, 10 Dec 2023 12:57:39 +0000 Subject: [PATCH] Prioritize ETL_TARGET_OS_* for mutex selection --- include/etl/mutex.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/etl/mutex.h b/include/etl/mutex.h index 625c4dc6..105c377b 100644 --- a/include/etl/mutex.h +++ b/include/etl/mutex.h @@ -31,15 +31,15 @@ SOFTWARE. #include "platform.h" -#if ETL_USING_STL && ETL_USING_CPP11 - #include "mutex/mutex_std.h" - #define ETL_HAS_MUTEX 1 -#elif defined(ETL_TARGET_OS_CMSIS_OS2) +#if defined(ETL_TARGET_OS_CMSIS_OS2) #include "mutex/mutex_cmsis_os2.h" #define ETL_HAS_MUTEX 1 #elif defined(ETL_TARGET_OS_FREERTOS) #include "mutex/mutex_freertos.h" #define ETL_HAS_MUTEX 1 +#elif ETL_USING_STL && ETL_USING_CPP11 + #include "mutex/mutex_std.h" + #define ETL_HAS_MUTEX 1 #elif defined(ETL_COMPILER_ARM5) || defined(ETL_COMPILER_ARM6) || defined(ETL_COMPILER_ARM7) || defined(ETL_COMPILER_ARM8) #include "mutex/mutex_arm.h" #define ETL_HAS_MUTEX 1