diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-12-10 14:35:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-10 14:35:15 -0800 |
| commit | 25be7ec4bff10e8865d2a1e9ccd9e4fe125cbe62 (patch) | |
| tree | 610dd6a7829573ff03b735a7f498a4d7ec61f44f | |
| parent | Merge branch 'yn/complete-date-format-options' (diff) | |
| parent | mingw: avoid fallback for {local,gm}time_r() (diff) | |
| download | tgif-25be7ec4bff10e8865d2a1e9ccd9e4fe125cbe62.tar.xz | |
Merge branch 'cb/mingw-gmtime-r'
Build fix on Windows.
* cb/mingw-gmtime-r:
mingw: avoid fallback for {local,gm}time_r()
| -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 9e0cd1e097..e14f2d5f77 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -1083,6 +1083,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) @@ -1096,6 +1097,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 98c4f2c81e..5fa54a7afe 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -148,7 +148,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 |