summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-01-27 17:08:40 +0100
committerBram Moolenaar <Bram@vim.org>2019-01-27 17:08:40 +0100
commit3e9d4d85c4b5602f072be76b51865050d51fb3c4 (patch)
treed6c2ef95fbf29e8e3dfdbf5aa969f9c96d74463f
parente40b9d47bf8f8f716d3ef5a95c8ecbbdc0a501f9 (diff)
downloadvim-git-3e9d4d85c4b5602f072be76b51865050d51fb3c4.tar.gz
patch 8.1.0835: GUI build fails on MS-Windowsv8.1.0835
Problem: GUI build fails on MS-Windows. Solution: Adjust #ifdef.
-rw-r--r--src/ui.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
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
@@ -784,6 +784,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 835,
+/**/
834,
/**/
833,