patch 8.2.4294: MS-Windows: #ifdefs for Cygwin are too complicated
Problem: MS-Windows: #ifdefs for Cygwin are too complicated.
Solution: Simplify the conditions. (Ken Takata, closes #9693)
diff --git a/src/main.c b/src/main.c
index 7c0c4e6..fa5d8f1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -11,11 +11,9 @@
#include "vim.h"
#ifdef __CYGWIN__
-# ifndef MSWIN
-# include <cygwin/version.h>
-# include <sys/cygwin.h> // for cygwin_conv_to_posix_path() and/or
+# include <cygwin/version.h>
+# include <sys/cygwin.h> // for cygwin_conv_to_posix_path() and/or
// cygwin_conv_path()
-# endif
# include <limits.h>
#endif
@@ -2570,7 +2568,7 @@
}
}
#endif
-#if defined(__CYGWIN32__) && !defined(MSWIN)
+#ifdef __CYGWIN32__
/*
* If vim is invoked by non-Cygwin tools, convert away any
* DOS paths, so things like .swp files are created correctly.