Merge branch 'mm/color-auto-default'

diff --git a/diff-no-index.c b/diff-no-index.c
index 74da659368e4db67715a9c81dc7a5e0edcd3bcce..e66fdf33da9e3dd3da561aadffec938e6bc2ad49 100644 (file)
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -45,7 +45,7 @@ static int get_mode(const char *path, int *mode)
 
        if (!path || !strcmp(path, "/dev/null"))
                *mode = 0;
-#ifdef _WIN32
+#ifdef GIT_WINDOWS_NATIVE
        else if (!strcasecmp(path, "nul"))
                *mode = 0;
 #endif