Merge branch 'rs/unpack-trees-tree-walk-conflict-field'

diff --git a/compat/win32.h b/compat/win32.h
index 8ce91048deffc17bdf8d51672ddaa0c867052ac5..a97e880757b6f1328fea90371da8f857648e6923 100644 (file)
--- a/compat/win32.h
+++ b/compat/win32.h
@@ -2,7 +2,7 @@
 #define WIN32_H
 
 /* common Win32 functions for MinGW and Cygwin */
-#ifndef WIN32         /* Not defined by Cygwin */
+#ifndef GIT_WINDOWS_NATIVE     /* Not defined for Cygwin */
 #include <windows.h>
 #endif