From 4ed0fded120dae6e37e0828d0e4b4ee3ca023e5f Mon Sep 17 00:00:00 2001
From: Sergey Markelov <sergey@solidstatenetworks.com>
Date: Wed, 14 Aug 2024 15:06:03 -0700
Subject: [PATCH] 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                         | 2 ++
 tf-psa-crypto/drivers/builtin/src/sha256.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/library/x509_crt.c b/library/x509_crt.c
index 5060ca330f..1de1ee64c1 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>
diff --git a/tf-psa-crypto/drivers/builtin/src/sha256.c b/tf-psa-crypto/drivers/builtin/src/sha256.c
index 49d98c327b..842b892cd5 100644
--- a/tf-psa-crypto/drivers/builtin/src/sha256.c
+++ b/tf-psa-crypto/drivers/builtin/src/sha256.c
@@ -152,7 +152,9 @@ static int mbedtls_a64_crypto_sha256_determine_support(void)
     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>