diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-02-17 17:44:42 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-02-17 17:44:42 +0100 |
| commit | 4f97475d326c2773a78561fb874e4f23c25cbcd9 (patch) | |
| tree | 7e066bc70556dfbb415ddb9f364e8432e8aaf189 /src/syntax.c | |
| parent | 78d21dae9c3a39efb30316d3e38dce120bc1abbd (diff) | |
| download | vim-git-4f97475d326c2773a78561fb874e4f23c25cbcd9.tar.gz | |
patch 8.1.0941: macros for MS-Windows are inconsistentv8.1.0941
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)
Diffstat (limited to 'src/syntax.c')
| -rw-r--r-- | src/syntax.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/syntax.c b/src/syntax.c index 16c75f27d..df351a31a 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -8274,7 +8274,7 @@ free_highlight(void) 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 @@ set_hl_attr( 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 @@ syn_id2colors(int hl_id, guicolor_T *fgp, guicolor_T *bgp) } #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) |