summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-09-15 15:57:29 +0200
committerBram Moolenaar <Bram@vim.org>2015-09-15 15:57:29 +0200
commit9534680731ea342c2fed01a812559958923480da (patch)
treea44dee71d6a0ebff4f71d9e0dbd2d81d342341d1
parent93c88e0f6a4a8f7634ed84721daf4af46fc0d5db (diff)
patch 7.4.867v7.4.867
Problem: Can't build on MS-Windows. (Taro Muraoka) Solution: Adjust #ifdef.
-rw-r--r--src/misc2.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/misc2.c b/src/misc2.c
index e6a4e747d9..407d6b5d55 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -6342,7 +6342,7 @@ parse_queued_messages()
/* Process the queued netbeans messages. */
netbeans_parse_messages();
# endif
-# ifdef FEAT_CLIENTSERVER
+# if defined(FEAT_CLIENTSERVER) && defined(FEAT_X11)
/* Process the queued clientserver messages. */
server_parse_messages();
# endif
diff --git a/src/version.c b/src/version.c
index e5038260fc..7d61973aa8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 867,
+/**/
866,
/**/
865,