diff --git a/src/ui.c b/src/ui.c
index 0d08c5d..d4278a3 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -399,7 +399,7 @@
 #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 0a6dce2..31bf378 100644
--- a/src/version.c
+++ b/src/version.c
@@ -784,6 +784,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    835,
+/**/
     834,
 /**/
     833,