commit ea5496ceb307ffb0614f8c24ec1bb096762bf979
author Cameron Cawley <ccawley2011@gmail.com> Mon Mar 08 23:29:26 2021 +0000
committer Dave Rodgman <dave.rodgman@arm.com> Tue May 10 13:46:09 2022 +0100
tree d6bd5da0724a5c2580eee29e39b0db5e34fcc319
parent a745c7d4398b22ceae1ce21bfbcb2fa2f7fab4d3

Fix compilation with MinGW32

Signed-off-by: Cameron Cawley <ccawley2011@gmail.com>

library/platform_util.c

diff --git a/library/platform_util.c b/library/platform_util.c
index 3d5cb5b..1d34e76 100644
--- a/library/platform_util.c
+++ b/library/platform_util.c
@@ -92,9 +92,11 @@
  * threading.h. However, this macro is not part of the Mbed TLS public API, so
  * we keep it private by only defining it in this file
  */
-#if ! ( defined(_WIN32) && !defined(EFIX64) && !defined(EFI32) )
+#if ! ( defined(_WIN32) && !defined(EFIX64) && !defined(EFI32) ) || \
+      ( defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) )
 #define PLATFORM_UTIL_USE_GMTIME
-#endif /* ! ( defined(_WIN32) && !defined(EFIX64) && !defined(EFI32) ) */
+#endif /* ! ( defined(_WIN32) && !defined(EFIX64) && !defined(EFI32) ) || \
+             (defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) ) */
 
 #endif /* !( ( defined(_POSIX_VERSION) && _POSIX_VERSION >= 200809L ) ||     \
              ( defined(_POSIX_THREAD_SAFE_FUNCTIONS ) &&                     \
@@ -103,7 +105,7 @@
 struct tm *mbedtls_platform_gmtime_r( const mbedtls_time_t *tt,
                                       struct tm *tm_buf )
 {
-#if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
+#if defined(_WIN32) && !defined(PLATFORM_UTIL_USE_GMTIME)
     return( ( gmtime_s( tm_buf, tt ) == 0 ) ? tm_buf : NULL );
 #elif !defined(PLATFORM_UTIL_USE_GMTIME)
     return( gmtime_r( tt, tm_buf ) );