diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-28 23:01:49 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-28 23:01:49 +0100 |
| commit | b8b6511fc1f8422a17778d710ed11538174a7f33 (patch) | |
| tree | 7f28db483cdf00bd444fc952ca35c650335f9b8b | |
| parent | fa06a517b5d5e37f40ab7c884bd334f089988fac (diff) | |
| download | vim-git-b8b6511fc1f8422a17778d710ed11538174a7f33.tar.gz | |
patch 7.4.1193v7.4.1193
Problem: Can't build the channel feature on MS-Windows.
Solution: Add #ifdef HAVE_POLL.
| -rw-r--r-- | src/channel.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/channel.c b/src/channel.c index 952123c53..c18f25e26 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 d9b9ebab9..98c499a92 100644 --- 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, |