Merge branch 'ks/difftool-dir-diff-copy-fix'

diff --git a/compat/winansi.c b/compat/winansi.c
index 44dc293ad314379d7835d9d96a5c3fd12ad2b27f..dedce2104eaf5cefbb1abef1b7921eb99c67a75e 100644 (file)
--- a/compat/winansi.c
+++ b/compat/winansi.c
@@ -2,7 +2,6 @@
  * Copyright 2008 Peter Harris <git@peter.is-a-geek.org>
  */
 
-#include <windows.h>
 #include "../git-compat-util.h"
 
 /*
@@ -80,6 +79,7 @@ static void set_console_attr(void)
 static void erase_in_line(void)
 {
        CONSOLE_SCREEN_BUFFER_INFO sbi;
+       DWORD dummy; /* Needed for Windows 7 (or Vista) regression */
 
        if (!console)
                return;
@@ -87,7 +87,7 @@ static void erase_in_line(void)
        GetConsoleScreenBufferInfo(console, &sbi);
        FillConsoleOutputCharacterA(console, ' ',
                sbi.dwSize.X - sbi.dwCursorPosition.X, sbi.dwCursorPosition,
-               NULL);
+               &dummy);
 }