From fca078fd9b35f810bff2517ed596f9013cd0597e Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Wed, 18 Dec 2019 10:20:35 +0000 Subject: [PATCH] Quick fix to ETL_HAS_MUTEX position in queue_mpmc_mutex.h --- include/etl/mutex.h | 2 +- include/etl/queue_mpmc_mutex.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/etl/mutex.h b/include/etl/mutex.h index 4c0e1562..7dcfc2c9 100644 --- a/include/etl/mutex.h +++ b/include/etl/mutex.h @@ -34,7 +34,7 @@ SOFTWARE. #if ETL_CPP11_SUPPORTED == 1 && !defined(ETL_NO_STL) #include "mutex/mutex_std.h" #define ETL_HAS_MUTEX 1 -#elif defined(ETL_COMPILER_ARM) +#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 #elif defined(ETL_COMPILER_GCC) diff --git a/include/etl/queue_mpmc_mutex.h b/include/etl/queue_mpmc_mutex.h index 410abfcc..9a52eb53 100644 --- a/include/etl/queue_mpmc_mutex.h +++ b/include/etl/queue_mpmc_mutex.h @@ -37,12 +37,12 @@ SOFTWARE. #include #include "platform.h" +#include "mutex.h" #if ETL_HAS_MUTEX #include "alignment.h" #include "parameter_type.h" -#include "mutex.h" #include "memory_model.h" #include "integral_limits.h"