commit 323d8019bf7e581c2b376b019e7ae59796fcede2
author Hanno Becker <hanno.becker@arm.com> Thu Sep 06 11:30:57 2018 +0100
committer Hanno Becker <hanno.becker@arm.com> Thu Sep 06 11:30:57 2018 +0100
tree 3fbcb5b405a66a7ead8a9519fe0b84dfba784ac8
parent 03b2bd4a062dc3ba5e14f3a5fee36690fa6624d7

Correct preprocessor guards determining use of gmtime()

The previous code erroneously used gmtime_r() to implement
mbedtls_platform_gmtime() in case of a non-windows, non-unix system.

include/mbedtls/threading.h

diff --git a/include/mbedtls/threading.h b/include/mbedtls/threading.h
index 11f6341..49ecdc3 100644
--- a/include/mbedtls/threading.h
+++ b/include/mbedtls/threading.h
@@ -108,10 +108,14 @@
 extern mbedtls_threading_mutex_t mbedtls_threading_readdir_mutex;
 #endif
 #if defined(MBEDTLS_HAVE_TIME_DATE) && !defined(MBEDTLS_PLATFORM_GMTIME_R_ALT)
+
 #if !defined(_WIN32) && (defined(unix) || \
     defined(__unix) || defined(__unix__) || (defined(__APPLE__) && \
     defined(__MACH__)))
 #include <unistd.h>
+#endif /* !_WIN32 && (unix || __unix || __unix__ ||
+        * (__APPLE__ && __MACH__)) */
+
 #if !( ( defined(_POSIX_VERSION) && _POSIX_VERSION >= 200809L ) ||     \
        ( defined(_POSIX_THREAD_SAFE_FUNCTIONS ) &&                     \
          _POSIX_THREAD_SAFE_FUNCTIONS >= 20112L ) )
@@ -124,8 +128,6 @@
 #endif /* !( ( defined(_POSIX_VERSION) && _POSIX_VERSION >= 200809L ) ||     \
              ( defined(_POSIX_THREAD_SAFE_FUNCTIONS ) &&                     \
                 _POSIX_THREAD_SAFE_FUNCTIONS >= 20112L ) ) */
-#endif /* !_WIN32 && (unix || __unix || __unix__ ||
-        * (__APPLE__ && __MACH__)) */
 #endif /* MBEDTLS_HAVE_TIME_DATE && !MBEDTLS_PLATFORM_GMTIME_R_ALT */
 #endif /* MBEDTLS_THREADING_C */