Merge branch 'mk/complete-tcsh'

diff --git a/compat/cygwin.c b/compat/cygwin.c
index dfe9b3084ffbfd6c41a648e32a1857e78b566215..5428858875a20b89411d3662e777586d9d798fab 100644 (file)
--- a/compat/cygwin.c
+++ b/compat/cygwin.c
@@ -1,6 +1,13 @@
 #define WIN32_LEAN_AND_MEAN
+#ifdef CYGWIN_V15_WIN32API
 #include "../git-compat-util.h"
 #include "win32.h"
+#else
+#include <sys/stat.h>
+#include <sys/errno.h>
+#include "win32.h"
+#include "../git-compat-util.h"
+#endif
 #include "../cache.h" /* to read configuration */
 
 static inline void filetime_to_timespec(const FILETIME *ft, struct timespec *ts)