patch 8.1.0941: macros for MS-Windows are inconsistent
Problem: Macros for MS-Windows are inconsistent, using "32", "3264 and
others.
Solution: Use MSWIN for all MS-Windows builds. Use FEAT_GUI_MSWIN for the
GUI build. (Hirohito Higashi, closes #3932)
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 79b9bc1..da10c12 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -1618,7 +1618,7 @@
*/
#ifndef FEAT_GUI_MSWIN
if (cmd == NULL
-# ifdef WIN3264
+# ifdef MSWIN
|| (winstart && !need_wait_return)
# endif
)
@@ -1643,7 +1643,7 @@
# endif
no_wait_return = save_nwr;
}
-#endif /* FEAT_GUI_W32 */
+#endif /* FEAT_GUI_MSWIN */
#ifdef MSWIN
if (!winstart) /* if winstart==TRUE, never stopped termcap! */
@@ -1935,7 +1935,7 @@
int shortname = FALSE; /* use 8.3 file name */
stat_T st_old; /* mch_stat() of existing viminfo file */
#endif
-#ifdef WIN3264
+#ifdef MSWIN
int hidden = FALSE;
#endif
@@ -1999,7 +1999,7 @@
goto end;
}
#endif
-#ifdef WIN3264
+#ifdef MSWIN
/* Get the file attributes of the existing viminfo file. */
hidden = mch_ishidden(fname);
#endif
@@ -2195,7 +2195,7 @@
++viminfo_errcnt;
semsg(_("E886: Can't rename viminfo file to %s!"), fname);
}
-# ifdef WIN3264
+# ifdef MSWIN
/* If the viminfo file was hidden then also hide the new file. */
else if (hidden)
mch_hide(fname);