From c92d7037dbd5f8cb9bb34ec3734a10f135ff38d6 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 11 Sep 2024 11:58:27 +0200 Subject: [PATCH] (!1685) os: log: use localtime_r() on mingw builds MingW also provides localtime_r(), but needs _POSIX_THREAD_SAFE_FUNCTIONS symbol before including anything, in order for the prototype being defined. Signed-off-by: Enrico Weigelt, metux IT consult --- os/log.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/os/log.c b/os/log.c index 3c6dabb76..e3b79cda1 100644 --- a/os/log.c +++ b/os/log.c @@ -75,6 +75,8 @@ OR PERFORMANCE OF THIS SOFTWARE. * authorization from the copyright holder(s) and author(s). */ +#define _POSIX_THREAD_SAFE_FUNCTIONS // for localtime_r on mingw32 + #ifdef HAVE_DIX_CONFIG_H #include #endif @@ -617,11 +619,7 @@ LogSWrite(int verb, const char *buf, size_t len, Bool end_line) struct tm tm; char fmt_tm[32]; -#ifdef WIN32 - localtime_s(&tm, &t); -#else localtime_r(&t, &tm); -#endif strftime(fmt_tm, sizeof(fmt_tm) - 1, "%Y-%m-%d %H:%M:%S", &tm); fprintf(logFile, "[%s] ", fmt_tm);