Merge branch 'km/avoid-cp-a' into maint

diff --git a/git-compat-util.h b/git-compat-util.h
index cbd86c37f51c00679498107d1a05131c19afa36e..d493a8c67ac1a91c40dfff0023c6ecf14155c09a 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -721,4 +721,11 @@ void warn_on_inaccessible(const char *path);
 /* Get the passwd entry for the UID of the current process. */
 struct passwd *xgetpwuid_self(void);
 
+#ifdef GMTIME_UNRELIABLE_ERRORS
+struct tm *git_gmtime(const time_t *);
+struct tm *git_gmtime_r(const time_t *, struct tm *);
+#define gmtime git_gmtime
+#define gmtime_r git_gmtime_r
+#endif
+
 #endif