From 3e9d4d85c4b5602f072be76b51865050d51fb3c4 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 27 Jan 2019 17:08:40 +0100
Subject: [PATCH] patch 8.1.0835: GUI build fails on MS-Windows

Problem:    GUI build fails on MS-Windows.
Solution:   Adjust #ifdef.
---
 src/ui.c      | 2 +-
 src/version.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/ui.c b/src/ui.c
index 0d08c5d05..d4278a39f 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -399,7 +399,7 @@ inchar_loop(
 #endif
 
 	if ((resize_func != NULL && resize_func(TRUE))
-#ifdef FEAT_CLIENTSERVER
+#if defined(FEAT_CLIENTSERVER) && defined(UNIX)
 		|| server_waiting()
 #endif
 #ifdef MESSAGE_QUEUE
diff --git a/src/version.c b/src/version.c
index 0a6dce29f..31bf37893 100644
--- a/src/version.c
+++ b/src/version.c
@@ -783,6 +783,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    835,
 /**/
     834,
 /**/
-- 
2.40.0