Merge branch 'cl/p4-use-diff-tree' into maint

diff --git a/compat/terminal.c b/compat/terminal.c
index 9b5e3d1bb8fe0adafb78721c09caff5b165dbf40..313897d581f0c5f2eae4d09b82d6ff8b98a21ea4 100644 (file)
--- a/compat/terminal.c
+++ b/compat/terminal.c
@@ -3,7 +3,7 @@
 #include "sigchain.h"
 #include "strbuf.h"
 
-#if defined(HAVE_DEV_TTY) || defined(WIN32)
+#if defined(HAVE_DEV_TTY) || defined(GIT_WINDOWS_NATIVE)
 
 static void restore_term(void);
 
@@ -53,7 +53,7 @@ static int disable_echo(void)
        return -1;
 }
 
-#elif defined(WIN32)
+#elif defined(GIT_WINDOWS_NATIVE)
 
 #define INPUT_PATH "CONIN$"
 #define OUTPUT_PATH "CONOUT$"