Merge branch 'da/p4merge-mktemp'

diff --git a/compat/cygwin.c b/compat/cygwin.c
index 59d86e4d1518dcccfe70b594015b5882ff82cc09..5428858875a20b89411d3662e777586d9d798fab 100644 (file)
--- a/compat/cygwin.c
+++ b/compat/cygwin.c
@@ -1,5 +1,5 @@
 #define WIN32_LEAN_AND_MEAN
-#ifdef V15_MINGW_HEADERS
+#ifdef CYGWIN_V15_WIN32API
 #include "../git-compat-util.h"
 #include "win32.h"
 #else