From: Johannes Schindelin <johannes.schindelin@xxxxxx>
Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
Signed-off-by: Steffen Prohaska <prohaska@xxxxxx>
---
compat/win32.h | 1 +
compat/winansi.c | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/compat/win32.h b/compat/win32.h
index c26384e..d531130 100644
--- a/compat/win32.h
+++ b/compat/win32.h
@@ -1,5 +1,6 @@
/* common Win32 functions for MinGW and Cygwin */
#include <windows.h>
+#include <conio.h>
static inline int file_attr_to_st_mode (DWORD attr)
{
diff --git a/compat/winansi.c b/compat/winansi.c
index 4bee335..9217c24 100644
--- a/compat/winansi.c
+++ b/compat/winansi.c
@@ -80,7 +80,7 @@ static void set_console_attr(void)
static void erase_in_line(void)
{
CONSOLE_SCREEN_BUFFER_INFO sbi;
- long dummy; /* Needed for Windows 7 (or Vista) regression */
+ DWORD dummy; /* Needed for Windows 7 (or Vista) regression */
if (!console)
return;
--
1.6.3.1.54.g99dd
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html