Skip to content

Do not define __PASTE macro for Arm-compiler #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 12, 2024
Merged

Do not define __PASTE macro for Arm-compiler #201

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6816d62
Do not define __PASTE macro for Arm-compiler
AhmedIsmail02 Jul 2, 2024
fab126a
Merge branch 'main' into undefine-paste-macro-for-armclang
urutva Oct 25, 2024
5e2087e
Merge branch 'main' into undefine-paste-macro-for-armclang
tony-josi-aws Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions source/include/core_pkcs11.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading