From 45e97bd246e115ca9ebdd6538939478c6c6e6343 Mon Sep 17 00:00:00 2001
From: alfred gedeon <alfred2g@hotmail.com>
Date: Wed, 26 Aug 2020 10:50:35 -0700
Subject: [PATCH] Fix: Add Parenthesis around if-statement in macro (#138)
Co-authored-by: Alfred Gedeon <gedeonag@amazon.com>
---
portable/GCC/ARM_CM4F/portmacro.h | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/portable/GCC/ARM_CM4F/portmacro.h b/portable/GCC/ARM_CM4F/portmacro.h
index ebc96431f..173c7cb80 100644
--- a/portable/GCC/ARM_CM4F/portmacro.h
+++ b/portable/GCC/ARM_CM4F/portmacro.h
@@ -90,7 +90,12 @@
#define portNVIC_INT_CTRL_REG ( *( ( volatile uint32_t * ) 0xe000ed04 ) )
#define portNVIC_PENDSVSET_BIT ( 1UL << 28UL )
- #define portEND_SWITCHING_ISR( xSwitchRequired ) if( xSwitchRequired != pdFALSE ) portYIELD()
+
+ #define portEND_SWITCHING_ISR( xSwitchRequired ) \
+ do { \
+ if( (xSwitchRequired) != pdFALSE ) portYIELD(); \
+ } while (0)
+
#define portYIELD_FROM_ISR( x ) portEND_SWITCHING_ISR( x )
/*-----------------------------------------------------------*/