Skip to content

Commit a74a04f

Browse files
committed
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 <[email protected]>
1 parent a1dc740 commit a74a04f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

git-compat-util.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ struct strbuf;
166166
/* Approximation of the length of the decimal representation of this type. */
167167
#define decimal_length(x) ((int)(sizeof(x) * 2.56 + 0.5) + 1)
168168

169-
#ifdef __MINGW64__
169+
#if defined(__MINGW32__) || defined(__MINGW64__)
170170
#define _POSIX_C_SOURCE 1
171171
#elif defined(__sun__)
172172
/*

0 commit comments

Comments
 (0)