commit 9534680731ea342c2fed01a812559958923480da
author Bram Moolenaar <Bram@vim.org> Tue Sep 15 15:57:29 2015 +0200
committer Bram Moolenaar <Bram@vim.org> Tue Sep 15 15:57:29 2015 +0200
tree a44dee71d6a0ebff4f71d9e0dbd2d81d342341d1
parent 93c88e0f6a4a8f7634ed84721daf4af46fc0d5db

patch 7.4.867
Problem:    Can't build on MS-Windows. (Taro Muraoka)
Solution:   Adjust #ifdef.

src/misc2.c

diff --git a/src/misc2.c b/src/misc2.c
index e6a4e74..407d6b5 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -6342,7 +6342,7 @@
     /* 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

src/version.c

diff --git a/src/version.c b/src/version.c
index e503826..7d61973 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    867,
+/**/
     866,
 /**/
     865,