commit 4ed0fded120dae6e37e0828d0e4b4ee3ca023e5f
author Sergey Markelov <sergey@solidstatenetworks.com> Wed Aug 14 15:06:03 2024 -0700
committer Sergey Markelov <sergey@solidstatenetworks.com> Wed Aug 14 15:15:14 2024 -0700
tree 100711b9e60e23655fd3e3c1e18b6c5517aff243
parent 8067879c1fa08b7357ae47567ee875b6eec46e5d

Fix Mbed-TLS build when WIN32_LEAN_AND_MEAN macro is defined globally

Signed-off-by: Sergey Markelov <sergey@solidstatenetworks.com>

library/x509_crt.c

diff --git a/library/x509_crt.c b/library/x509_crt.c
index 5060ca3..1de1ee6 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -48,7 +48,9 @@
 
 #if defined(MBEDTLS_HAVE_TIME)
 #if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #else
 #include <time.h>

tf-psa-crypto/drivers/builtin/src/sha256.c

diff --git a/tf-psa-crypto/drivers/builtin/src/sha256.c b/tf-psa-crypto/drivers/builtin/src/sha256.c
index 49d98c3..842b892 100644
--- a/tf-psa-crypto/drivers/builtin/src/sha256.c
+++ b/tf-psa-crypto/drivers/builtin/src/sha256.c
@@ -152,7 +152,9 @@
     return 1;
 }
 #elif defined(MBEDTLS_PLATFORM_IS_WINDOWS_ON_ARM64)
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
 #include <Windows.h>
 #include <processthreadsapi.h>