From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 28 Jan 2016 22:01:49 +0000 (+0100)
Subject: patch 7.4.1193
X-Git-Tag: v7.4.1193
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8b6511fc1f8422a17778d710ed11538174a7f33;p=thirdparty%2Fvim.git

patch 7.4.1193
Problem:    Can't build the channel feature on MS-Windows.
Solution:   Add #ifdef HAVE_POLL.
---

diff --git a/src/channel.c b/src/channel.c
index 952123c539..c18f25e263 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -726,12 +726,14 @@ channel_wait(int fd, int timeout)
 	break;
     }
 #else
+# ifdef HAVE_POLL
     struct pollfd	fds;
 
     fds.fd = fd;
     fds.events = POLLIN;
     if (poll(&fds, 1, timeout) <= 0)
 	return FAIL;
+# endif
 #endif
     return OK;
 }
diff --git a/src/version.c b/src/version.c
index d9b9ebab99..98c499a925 100644
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1193,
 /**/
     1192,
 /**/