Do not define __PASTE macro for Arm-compiler (#201)

__PASTE macro is defined for Arm Compiler in its header files so to avoid conflicts it is undefined as it is already defined by corePkcs11 headers. Signed-off-by: Ahmed Ismail <[email protected]> Co-authored-by: Ahmed Ismail <[email protected]> Co-authored-by: Tony Josi <[email protected]>
FreeRTOS · Nov 12, 2024 · 8a4ac0e · 8a4ac0e
1 parent 1f86d12
commit 8a4ac0e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/source/include/core_pkcs11.h b/source/include/core_pkcs11.h
@@ -197,8 +197,8 @@
 
 /* Bring in the public header. */
 
-/* Undefine the macro for Keil Compiler to avoid conflict */
-#if defined( __PASTE ) && defined( __CC_ARM )
+/* Undefine the macro for Keil and ARMClang Compilers to avoid conflict */
+#if defined( __PASTE ) && ( defined( __CC_ARM ) || defined( __ARMCC_VERSION ) )
     /* ARM RCVT stdint.h has a duplicate definition with PKCS #11. */
     #undef __PASTE
 #endif