Skip to content

Commit 9377df3

Browse files
committed
patch 8.0.1195: can't build on MS-Windows
Problem: Can't build on MS-Windows. Solution: Adjust #ifdef and add #ifdefs.
1 parent 65e4c4f commit 9377df3

3 files changed

Lines changed: 9 additions & 3 deletions

File tree

src/term.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ static int crv_status = STATUS_GET;
125125
/* Request Cursor position report: */
126126
static int u7_status = STATUS_GET;
127127

128-
#ifdef FEAT_TERMINAL
128+
# ifdef FEAT_TERMINAL
129129
/* Request foreground color report: */
130130
static int rfg_status = STATUS_GET;
131131
static int fg_r = 0;
@@ -134,7 +134,7 @@ static int fg_b = 0;
134134
static int bg_r = 255;
135135
static int bg_g = 255;
136136
static int bg_b = 255;
137-
#endif
137+
# endif
138138

139139
/* Request background color report: */
140140
static int rbg_status = STATUS_GET;
@@ -5828,7 +5828,7 @@ check_termcode(
58285828
return 0; /* no match found */
58295829
}
58305830

5831-
#if defined(FEAT_TERMINAL) || defined(PROTO)
5831+
#if (defined(FEAT_TERMINAL) && defined(FEAT_TERMRESPONSE)) || defined(PROTO)
58325832
/*
58335833
* Get the text foreground color, if known.
58345834
*/

src/terminal.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2624,8 +2624,10 @@ create_vterm(term_T *term, int rows, int cols)
26242624
fg->blue = tmp;
26252625
# endif
26262626
}
2627+
# ifdef FEAT_TERMRESPONSE
26272628
else
26282629
term_get_fg_color(&fg->red, &fg->green, &fg->blue);
2630+
# endif
26292631

26302632
if (cterm_normal_bg_color > 0)
26312633
{
@@ -2636,8 +2638,10 @@ create_vterm(term_T *term, int rows, int cols)
26362638
bg->blue = tmp;
26372639
# endif
26382640
}
2641+
# ifdef FEAT_TERMRESPONSE
26392642
else
26402643
term_get_bg_color(&bg->red, &bg->green, &bg->blue);
2644+
# endif
26412645
}
26422646

26432647
vterm_state_set_default_colors(vterm_obtain_state(vterm), fg, bg);

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -761,6 +761,8 @@ static char *(features[]) =
761761

762762
static int included_patches[] =
763763
{ /* Add new patch number below this line */
764+
/**/
765+
1195,
764766
/**/
765767
1194,
766768
/**/

0 commit comments

Comments
 (0)