localtime_r on native Windows

1 files changed, 27 insertions, 2 deletions

diff --git a/src/port/time.c b/src/port/time.c
index c96d6e2..da97905 100644
--- a/src/port/time.c
+++ b/src/port/time.c
@@ -46,8 +46,33 @@ struct tm *wolf_port_localtime_r( const time_t *timep, struct tm *result ) {
 	return ( local_result != NULL ) ? result : NULL;
 }
 
+#else /* defined HAVE_PTHREADS */
+
+#if defined _WIN32
+
+/* localtime on Windows uses thread-local data to make things thread-safe,
+ * see MinGW mailing-lists. So we can safely copy the local buffer to the
+ * result without locking.
+ * TODO: needs testing of the hypothesis!
+ */
+
+#include "port/string.h"	/* for memcpy */
+
+struct tm *wolf_port_localtime_r( const time_t *timep, struct tm *result ) {
+	struct tm *local_result;
+
+	local_result = localtime( timep );
+	if( local_result != NULL ) {
+		memcpy( result, local_result, sizeof( struct tm ) );
+	}
+
+	return ( local_result != NULL ) ? result : NULL;
+}
+
 #else
 #error no pthreads, port localtime_r differently!
-#endif
+#endif /* defined _WIN32 */
+
+#endif /* defined HAVE_PTHREADS */
 
-#endif /* !defined HAVE_LOCALTIME_R */
+#endif /* !defined HAVE_LOCALTIME_R || defined TEST_LOCALTIME_R */