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/syntax.c b/src/syntax.c
index 16c75f2..df351a3 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -8274,7 +8274,7 @@
void
restore_cterm_colors(void)
{
-#if defined(WIN3264) && !defined(FEAT_GUI_W32)
+#if defined(MSWIN) && !defined(FEAT_GUI_MSWIN)
/* Since t_me has been set, this probably means that the user
* wants to use this as default colors. Need to reset default
* background/foreground colors. */
@@ -9559,7 +9559,7 @@
at_en.ae_u.cterm.fg_color = sgp->sg_cterm_fg;
at_en.ae_u.cterm.bg_color = sgp->sg_cterm_bg;
# ifdef FEAT_TERMGUICOLORS
-# ifdef WIN3264
+# ifdef MSWIN
{
int id;
guicolor_T fg, bg;
@@ -9822,8 +9822,8 @@
}
#endif
-#if (defined(WIN3264) \
- && !defined(FEAT_GUI_W32) \
+#if (defined(MSWIN) \
+ && !defined(FEAT_GUI_MSWIN) \
&& defined(FEAT_TERMGUICOLORS)) || defined(PROTO)
void
syn_id2cterm_bg(int hl_id, int *fgp, int *bgp)