Merge branch 'cb/mingw-gmtime-r'

gitster · gitster · commit 25be7ec4bff1 · 2021-12-10T14:35:15.000-08:00
Build fix on Windows.

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

Original file line number	Diff line number	Diff line change
`@@ -1083,6 +1083,7 @@ int pipe(int filedes[2])`
`1083`	`1083`	`return 0;`
`1084`	`1084`	`}`
`1085`	`1085`
	`1086`	`+#ifndef __MINGW64__`
`1086`	`1087`	`struct tm gmtime_r(const time_t timep, struct tm *result)`
`1087`	`1088`	`{`
`1088`	`1089`	`if (gmtime_s(result, timep) == 0)`
`@@ -1096,6 +1097,7 @@ struct tm localtime_r(const time_t timep, struct tm *result)`
`1096`	`1097`	`return result;`
`1097`	`1098`	`return NULL;`
`1098`	`1099`	`}`
	`1100`	`+#endif`
`1099`	`1101`
`1100`	`1102`	`char mingw_getcwd(char pointer, int len)`
`1101`	`1103`	`{`