summaryrefslogtreecommitdiff
path: root/src/osal
diff options
context:
space:
mode:
authorYunhao Tian <[email protected]>2021-11-30 17:11:09 +0800
committerYunhao Tian <[email protected]>2021-11-30 17:19:11 +0800
commitac20605e3f098687ce40349bbecc9266333d951b (patch)
tree8d707fc933b2b8cd6decd2bc46820c31c55fd294 /src/osal
parentdba59217da489dc497cbe2b573e7e144d085c869 (diff)
Ignore certain compiler options on ARMCC
ARMCC also sets __GNU__ macro, but doesn't support GCC diagnostic pragmas.
Diffstat (limited to 'src/osal')
-rw-r--r--src/osal/osal.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/osal/osal.h b/src/osal/osal.h
index c8131d19d..9194f80d5 100644
--- a/src/osal/osal.h
+++ b/src/osal/osal.h
@@ -67,7 +67,7 @@ typedef void (*osal_task_func_t)( void * );
// OSAL Porting API
//--------------------------------------------------------------------+
-#if __GNUC__
+#if __GNUC__ && !defined(__ARMCC_VERSION)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wredundant-decls"
#endif
@@ -88,7 +88,7 @@ static inline osal_queue_t osal_queue_create(osal_queue_def_t* qdef);
static inline bool osal_queue_receive(osal_queue_t qhdl, void* data);
static inline bool osal_queue_send(osal_queue_t qhdl, void const * data, bool in_isr);
static inline bool osal_queue_empty(osal_queue_t qhdl);
-#if __GNUC__
+#if __GNUC__ && !defined(__ARMCC_VERSION)
#pragma GCC diagnostic pop
#endif