Merge pull request #3398 from carenas/pthread-unistd

dscho · dscho · commit 767a9641deb0 · 2021-12-03T15:05:25.000+01:00
mingw: avoid fallback for {local,gm}time_r()
diff --git a/compat/mingw.c b/compat/mingw.c
@@ -1091,6 +1091,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)
@@ -1104,6 +1105,7 @@ struct tm *localtime_r(const time_t *timep, struct tm *result)
 		return result;
 	return NULL;
 }
+#endif
 
 char *mingw_strbuf_realpath(struct strbuf *resolved, const char *path)
 {
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
`@@ -1091,6 +1091,7 @@ int pipe(int filedes[2])`
`1091`	`1091`	`return 0;`
`1092`	`1092`	`}`
`1093`	`1093`
	`1094`	`+#ifndef __MINGW64__`
`1094`	`1095`	`struct tm gmtime_r(const time_t timep, struct tm *result)`
`1095`	`1096`	`{`
`1096`	`1097`	`if (gmtime_s(result, timep) == 0)`
`@@ -1104,6 +1105,7 @@ struct tm localtime_r(const time_t timep, struct tm *result)`
`1104`	`1105`	`return result;`
`1105`	`1106`	`return NULL;`
`1106`	`1107`	`}`
	`1108`	`+#endif`
`1107`	`1109`
`1108`	`1110`	`char mingw_strbuf_realpath(struct strbuf resolved, const char *path)`
`1109`	`1111`	`{`