diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2022-03-17 12:52:12 +0100 |
|---|---|---|
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | 2022-03-17 12:52:12 +0100 |
| commit | 2a9a5862e516935149697f710f4fb00f14b7c40b (patch) | |
| tree | 742bc0a88a7af3e1b85e94a264346ffb57b2e1ca | |
| parent | Git 2.30.2 (diff) | |
| parent | mingw: avoid fallback for {local,gm}time_r() (diff) | |
| download | tgif-2a9a5862e516935149697f710f4fb00f14b7c40b.tar.xz | |
Merge branch 'cb/mingw-gmtime-r'
Build fix on Windows.
* cb/mingw-gmtime-r:
mingw: avoid fallback for {local,gm}time_r()
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| -rw-r--r-- | compat/mingw.c | 2 | ||||
| -rw-r--r-- | git-compat-util.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/compat/mingw.c b/compat/mingw.c index a43599841c..abb4d26ce9 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -1060,6 +1060,7 @@ int pipe(int filedes[2]) return 0; } +#ifndef __MINGW64__ struct tm *gmtime_r(const time_t *timep, struct tm *result) { if (gmtime_s(result, timep) == 0) @@ -1073,6 +1074,7 @@ struct tm *localtime_r(const time_t *timep, struct tm *result) return result; return NULL; } +#endif char *mingw_getcwd(char *pointer, int len) { diff --git a/git-compat-util.h b/git-compat-util.h index 7d3db43f11..3da9f975e2 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -127,7 +127,9 @@ /* Approximation of the length of the decimal representation of this type. */ #define decimal_length(x) ((int)(sizeof(x) * 2.56 + 0.5) + 1) -#if defined(__sun__) +#ifdef __MINGW64__ +#define _POSIX_C_SOURCE 1 +#elif defined(__sun__) /* * On Solaris, when _XOPEN_EXTENDED is set, its header file * forces the programs to be XPG4v2, defeating any _XOPEN_SOURCE |