From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 20 May 2018 11:35:44 +0000 (+0200)
Subject: patch 8.1.0006: syn_id2cterm_bg() may be undefined
X-Git-Tag: v8.1.0006
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a772baf85afac44bb8eb20ff808637ee6eedec54;p=thirdparty%2Fvim.git

patch 8.1.0006: syn_id2cterm_bg() may be undefined

Problem:    syn_id2cterm_bg() may be undefined. (Axel Bender)
Solution:   Adjust #ifdef.
---

diff --git a/src/syntax.c b/src/syntax.c
index bb695b5734..5feaac6f59 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -9854,7 +9854,9 @@ syn_id2colors(int hl_id, guicolor_T *fgp, guicolor_T *bgp)
 }
 #endif
 
-#if defined(FEAT_TERMINAL) || defined(PROTO)
+#if (defined(WIN3264) \
+	&& !defined(FEAT_GUI_W32) \
+	&& defined(FEAT_TERMGUICOLORS)) || defined(PROTO)
     void
 syn_id2cterm_bg(int hl_id, int *fgp, int *bgp)
 {
diff --git a/src/version.c b/src/version.c
index a3eb91a618..4093a8c00b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    6,
 /**/
     5,
 /**/