Permalink
Browse files

patch 8.0.1195: can't build on MS-Windows

Problem:    Can't build on MS-Windows.
Solution:   Adjust #ifdef and add #ifdefs.
  • Loading branch information...
brammool committed Oct 15, 2017
1 parent 65e4c4f commit 9377df3ecd0bd3acb5d46cb8af7fe60867f247f2
Showing with 9 additions and 3 deletions.
  1. +3 −3 src/term.c
  2. +4 −0 src/terminal.c
  3. +2 −0 src/version.c
View
@@ -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.
*/
View
@@ -2624,8 +2624,10 @@ create_vterm(term_T *term, int rows, int cols)
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 cols)
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);
View
@@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1195,
/**/
1194,
/**/

0 comments on commit 9377df3

Please sign in to comment.