Merge branch 'cb/mingw-gmtime-r'

dscho · dscho · commit 2a9a5862e516 · 2022-03-17T12:52:12.000+01:00
Build fix on Windows.

* cb/mingw-gmtime-r:
  mingw: avoid fallback for {local,gm}time_r()

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
diff --git 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)
 {
diff --git a/git-compat-util.h b/git-compat-util.h
@@ -127,7 +127,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
`@@ -1060,6 +1060,7 @@ int pipe(int filedes[2])`
`1060`	`1060`	`return 0;`
`1061`	`1061`	`}`
`1062`	`1062`
	`1063`	`+#ifndef __MINGW64__`
`1063`	`1064`	`struct tm gmtime_r(const time_t timep, struct tm *result)`
`1064`	`1065`	`{`
`1065`	`1066`	`if (gmtime_s(result, timep) == 0)`
`@@ -1073,6 +1074,7 @@ struct tm localtime_r(const time_t timep, struct tm *result)`
`1073`	`1074`	`return result;`
`1074`	`1075`	`return NULL;`
`1075`	`1076`	`}`
	`1077`	`+#endif`
`1076`	`1078`
`1077`	`1079`	`char mingw_getcwd(char pointer, int len)`
`1078`	`1080`	`{`