From 2734642975a7e9dd3043357c4401fb0f64ff7c34 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 21 May 2024 13:55:26 +0200 Subject: [PATCH] win32: ensure that `localtime_r()` is declared even in i686 builds The `__MINGW64__` constant is defined, surprise, surprise, only when building for a 64-bit CPU architecture. Therefore using it as a guard to define `_POSIX_C_SOURCE` (so that `localtime_r()` is declared, among other functions) is not enough, we also need to check `__MINGW32__`. Technically, the latter constant is defined even for 64-bit builds. But let's make things a bit easier to understand by testing for both constants. Making it so fixes this compile warning (turned error in GCC v14.1): archive-zip.c: In function 'dos_time': archive-zip.c:612:9: error: implicit declaration of function 'localtime_r'; did you mean 'localtime_s'? [-Wimplicit-function-declaration] 612 | localtime_r(&time, &tm); | ^~~~~~~~~~~ | localtime_s Signed-off-by: Johannes Schindelin --- compat/posix.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compat/posix.h b/compat/posix.h index 245386fa4a..9bb6f09630 100644 --- a/compat/posix.h +++ b/compat/posix.h @@ -45,7 +45,7 @@ #define UNUSED #endif -#ifdef __MINGW64__ +#if defined(__MINGW32__) || defined(__MINGW64__) #define _POSIX_C_SOURCE 1 #elif defined(__sun__) /*