diff --git a/portable/ThirdParty/xClang/XCOREAI/portmacro.h b/portable/ThirdParty/xClang/XCOREAI/portmacro.h
index 22d8a833a..3602e8b16 100644
--- a/portable/ThirdParty/xClang/XCOREAI/portmacro.h
+++ b/portable/ThirdParty/xClang/XCOREAI/portmacro.h
@@ -152,10 +152,11 @@
 
         #define portASSERT_IF_IN_ISR()                    configASSERT( portCHECK_IF_IN_ISR() == 0 )
 
-        #define portGET_ISR_LOCK( xCoreID )               ( (void)xCoreID, rtos_lock_acquire( 0 ) )
-        #define portRELEASE_ISR_LOCK( xCoreID )           ( (void)xCoreID, rtos_lock_release( 0 ) )
-        #define portGET_TASK_LOCK( xCoreID )              ( (void)xCoreID, rtos_lock_acquire( 1 ) )
-        #define portRELEASE_TASK_LOCK( xCoreID )          ( (void)xCoreID, rtos_lock_release( 1 ) )
+        #define portGET_ISR_LOCK( xCoreID )               do{ ( void )( xCoreID ); rtos_lock_acquire( 0 ) ); } while( 0 )
+        #define portRELEASE_ISR_LOCK( xCoreID )           do{ ( void )( xCoreID ); rtos_lock_release( 0 ) ); } while( 0 )
+        #define portGET_TASK_LOCK( xCoreID )              do{ ( void )( xCoreID ); rtos_lock_acquire( 1 ) ); } while( 0 )
+        #define portRELEASE_TASK_LOCK( xCoreID )          do{ ( void )( xCoreID ); rtos_lock_release( 1 ) ); } while( 0 )
+
 
         void vTaskEnterCritical( void );
         void vTaskExitCritical( void );