summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2022-03-17 12:52:12 +0100
committerLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2022-03-17 12:52:12 +0100
commit2a9a5862e516935149697f710f4fb00f14b7c40b (patch)
tree742bc0a88a7af3e1b85e94a264346ffb57b2e1ca /compat
parentGit 2.30.2 (diff)
parentmingw: avoid fallback for {local,gm}time_r() (diff)
downloadtgif-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>
Diffstat (limited to 'compat')
-rw-r--r--compat/mingw.c2
1 files changed, 2 insertions, 0 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)
{