Merge branch 'mh/reflife'

diff --git a/compat/win32.h b/compat/win32.h
index e8c178d8cdc9e2f729cade3e6ee37461c5dfe90f..a97e880757b6f1328fea90371da8f857648e6923 100644 (file)
--- a/compat/win32.h
+++ b/compat/win32.h
@@ -2,7 +2,9 @@
 #define WIN32_H
 
 /* common Win32 functions for MinGW and Cygwin */
+#ifndef GIT_WINDOWS_NATIVE     /* Not defined for Cygwin */
 #include <windows.h>
+#endif
 
 static inline int file_attr_to_st_mode (DWORD attr)
 {