Mercurial > vim
changeset 12634:94566ecb55f0 v8.0.1195
patch 8.0.1195: can't build on MS-Windows
commit https://github.com/vim/vim/commit/9377df3ecd0bd3acb5d46cb8af7fe60867f247f2
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Oct 15 13:22:01 2017 +0200
patch 8.0.1195: can't build on MS-Windows
Problem: Can't build on MS-Windows.
Solution: Adjust #ifdef and add #ifdefs.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 15 Oct 2017 13:30:05 +0200 |
| parents | c247f9a0e56a |
| children | c49d77dd0e13 |
| files | src/term.c src/terminal.c src/version.c |
| diffstat | 3 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/term.c +++ b/src/term.c @@ -125,7 +125,7 @@ static int crv_status = STATUS_GET; /* Request Cursor position report: */ static int u7_status = STATUS_GET; -#ifdef FEAT_TERMINAL +# ifdef FEAT_TERMINAL /* Request foreground color report: */ static int rfg_status = STATUS_GET; static int fg_r = 0; @@ -134,7 +134,7 @@ static int fg_b = 0; static int bg_r = 255; static int bg_g = 255; static int bg_b = 255; -#endif +# endif /* Request background color report: */ static int rbg_status = STATUS_GET; @@ -5828,7 +5828,7 @@ check_termcode( return 0; /* no match found */ } -#if defined(FEAT_TERMINAL) || defined(PROTO) +#if (defined(FEAT_TERMINAL) && defined(FEAT_TERMRESPONSE)) || defined(PROTO) /* * Get the text foreground color, if known. */
--- a/src/terminal.c +++ b/src/terminal.c @@ -2624,8 +2624,10 @@ create_vterm(term_T *term, int rows, int fg->blue = tmp; # endif } +# ifdef FEAT_TERMRESPONSE else term_get_fg_color(&fg->red, &fg->green, &fg->blue); +# endif if (cterm_normal_bg_color > 0) { @@ -2636,8 +2638,10 @@ create_vterm(term_T *term, int rows, int bg->blue = tmp; # endif } +# ifdef FEAT_TERMRESPONSE else term_get_bg_color(&bg->red, &bg->green, &bg->blue); +# endif } vterm_state_set_default_colors(vterm_obtain_state(vterm), fg, bg);