summaryrefslogtreecommitdiffstats
path: root/src/main.c
diff options
context:
space:
mode:
authorK.Takata <kentkt@csc.jp>2022-02-04 10:45:38 +0000
committerBram Moolenaar <Bram@vim.org>2022-02-04 10:45:38 +0000
commit972db232795874c58b9fdf23e43f53885a378eae (patch)
tree2f8b420077aa6d3c9bb54876f8d1d1d2c6b85896 /src/main.c
parent7676c158798a7c90f500cab2c12af0d47bad6026 (diff)
patch 8.2.4294: MS-Windows: #ifdefs for Cygwin are too complicatedv8.2.4294
Problem: MS-Windows: #ifdefs for Cygwin are too complicated. Solution: Simplify the conditions. (Ken Takata, closes #9693)
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/main.c b/src/main.c
index 7c0c4e64fc..fa5d8f1d3d 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 @@ scripterror:
}
}
#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.