summary refs log tree commit diff
path: root/compat
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-12-10 14:35:15 -0800
committerJunio C Hamano <gitster@pobox.com>2021-12-10 14:35:15 -0800
commit25be7ec4bff10e8865d2a1e9ccd9e4fe125cbe62 (patch)
tree610dd6a7829573ff03b735a7f498a4d7ec61f44f /compat
parent4b1197ab5a74982fd09bda07d17325f1261975ee (diff)
parent9e12400da8d2b71e1fd7ccaa8f3c9cdbc52df554 (diff)
Merge branch 'cb/mingw-gmtime-r'
Build fix on Windows.

* cb/mingw-gmtime-r:
  mingw: avoid fallback for {local,gm}time_r()
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 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)
 {