Merge branch 'maint'

diff --git a/compat/mingw.h b/compat/mingw.h
index 5a3bcee29b7e39f52dcae40aeed611c01cec920e..8ffec51e73f49a54d82dd40f1e301e9c5479ffcf 100644 (file)
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -193,6 +193,17 @@ static inline unsigned int git_ntohl(unsigned int x)
 sig_handler_t mingw_signal(int sig, sig_handler_t handler);
 #define signal mingw_signal
 
+/*
+ * ANSI emulation wrappers
+ */
+
+int winansi_fputs(const char *str, FILE *stream);
+int winansi_printf(const char *format, ...) __attribute__((format (printf, 1, 2)));
+int winansi_fprintf(FILE *stream, const char *format, ...) __attribute__((format (printf, 2, 3)));
+#define fputs winansi_fputs
+#define printf(...) winansi_printf(__VA_ARGS__)
+#define fprintf(...) winansi_fprintf(__VA_ARGS__)
+
 /*
  * git specific compatibility
  */