Merge branch 'ap/merge-backend-opts'

diff --git a/git-compat-util.h b/git-compat-util.h
index f64cc454e7b63b7922bd425218dfdb52ba5c6038..aff627a85a812bb782e68cd27d06eb42d7dac537 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -96,6 +96,7 @@
 #include <sys/poll.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
+#include <termios.h>
 #ifndef NO_SYS_SELECT_H
 #include <sys/select.h>
 #endif
@@ -199,7 +200,6 @@ extern void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_lis
 
 extern int prefixcmp(const char *str, const char *prefix);
 extern int suffixcmp(const char *str, const char *suffix);
-extern time_t tm_to_time_t(const struct tm *tm);
 
 static inline const char *skip_prefix(const char *str, const char *prefix)
 {