changeset 7793:2981a37cec61 v7.4.1193

commit https://github.com/vim/vim/commit/b8b6511fc1f8422a17778d710ed11538174a7f33 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jan 28 23:01:49 2016 +0100 patch 7.4.1193 Problem: Can't build the channel feature on MS-Windows. Solution: Add #ifdef HAVE_POLL.
author Christian Brabandt <cb@256bit.org>
date Thu, 28 Jan 2016 23:15:04 +0100
parents 05ab49635a50
children 4815b3e3c3c1
files src/channel.c src/version.c
diffstat 2 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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;
 }
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1193,
+/**/
     1192,
 /**/
     1191,