From 8a4ac0e0e27a83da5c2a5e8c87f34998f6eb7aaf Mon Sep 17 00:00:00 2001 From: Devaraj Ranganna Date: Tue, 12 Nov 2024 16:29:00 +0000 Subject: [PATCH] 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 Co-authored-by: Ahmed Ismail Co-authored-by: Tony Josi --- source/include/core_pkcs11.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/include/core_pkcs11.h b/source/include/core_pkcs11.h index 6c3b3ddd..d25f7f67 100644 --- 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