commit 972db232795874c58b9fdf23e43f53885a378eae
author K.Takata <kentkt@csc.jp> Fri Feb 04 10:45:38 2022 +0000
committer Bram Moolenaar <Bram@vim.org> Fri Feb 04 10:45:38 2022 +0000
tree 2f8b420077aa6d3c9bb54876f8d1d1d2c6b85896
parent 7676c158798a7c90f500cab2c12af0d47bad6026

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)

src/os_unix.c

diff --git a/src/os_unix.c b/src/os_unix.c
index 9848698..cbd8ba8 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -44,15 +44,13 @@
 #endif
 
 #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
 				// for cygwin_conv_path()
-#  ifdef FEAT_CYGWIN_WIN32_CLIPBOARD
-#   define WIN32_LEAN_AND_MEAN
-#   include <windows.h>
-#   include "winclip.pro"
-#  endif
+# ifdef FEAT_CYGWIN_WIN32_CLIPBOARD
+#  define WIN32_LEAN_AND_MEAN
+#  include <windows.h>
+#  include "winclip.pro"
 # endif
 #endif