Merge branch 'jk/maint-diffstat-overflow' into maint

diff --git a/git-compat-util.h b/git-compat-util.h
index 812f55af89178a30a18dc54b69fb8802f3e1d9cf..a3c45373669cd8482c04d5815862ed36a153572d 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -178,6 +178,9 @@ extern char *gitbasename(char *);
 #ifdef __GNUC__
 #define NORETURN __attribute__((__noreturn__))
 #define NORETURN_PTR __attribute__((__noreturn__))
+#elif defined(_MSC_VER)
+#define NORETURN __declspec(noreturn)
+#define NORETURN_PTR
 #else
 #define NORETURN
 #define NORETURN_PTR
@@ -199,7 +202,7 @@ extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2)))
 extern void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list params));
 
 extern int prefixcmp(const char *str, const char *prefix);
-extern time_t tm_to_time_t(const struct tm *tm);
+extern int suffixcmp(const char *str, const char *suffix);
 
 static inline const char *skip_prefix(const char *str, const char *prefix)
 {