commit 9377df3ecd0bd3acb5d46cb8af7fe60867f247f2
author Bram Moolenaar <Bram@vim.org> Sun Oct 15 13:22:01 2017 +0200
committer Bram Moolenaar <Bram@vim.org> Sun Oct 15 13:22:01 2017 +0200
tree b6ef803c19ff558bd280b1c79fbc6362fb66eda3
parent 65e4c4f6868882a380c319632a1728a5e7d274ad

patch 8.0.1195: can't build on MS-Windows

Problem:    Can't build on MS-Windows.
Solution:   Adjust #ifdef and add #ifdefs.

src/term.c

diff --git a/src/term.c b/src/term.c
index f618069..7a48f99 100644
--- a/src/term.c
+++ b/src/term.c
@@ -125,7 +125,7 @@
 /* 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 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 @@
     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.
  */

src/terminal.c

diff --git a/src/terminal.c b/src/terminal.c
index 9519c81..7aa0a40 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -2624,8 +2624,10 @@
 	    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 @@
 	    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);

src/version.c

diff --git a/src/version.c b/src/version.c
index a762e1e..5e87e25 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1195,
+/**/
     1194,
 /**/
     1193,