summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-05-20 13:35:44 +0200
committerBram Moolenaar <Bram@vim.org>2018-05-20 13:35:44 +0200
commita772baf85afac44bb8eb20ff808637ee6eedec54 (patch)
tree5d6bfa5f614f5c9fd54ae25d998dc01cd58f27fc
parentd19b234154476401a6ad8e690f9705419095f44e (diff)
patch 8.1.0006: syn_id2cterm_bg() may be undefinedv8.1.0006
Problem: syn_id2cterm_bg() may be undefined. (Axel Bender) Solution: Adjust #ifdef.
-rw-r--r--src/syntax.c4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
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
@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 6,
+/**/
5,
/**/
4,