diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-16 13:11:17 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-16 13:11:17 +0100 |
| commit | 0943a09db84b036ec550d7f2e5b832f621b400ca (patch) | |
| tree | d39988696918f0c72915b40cafc51e9802431e73 | |
| parent | 5cefd4098204b4677387511b586673649f2fab48 (diff) | |
| download | vim-git-0943a09db84b036ec550d7f2e5b832f621b400ca.tar.gz | |
patch 7.4.1330v7.4.1330
Problem: fd_read() has an unused argument.
Solution: Remove the timeout. (Yasuhiro Matsumoto)
| -rw-r--r-- | src/channel.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/channel.c b/src/channel.c index 003c93336..10d942425 100644 --- a/src/channel.c +++ b/src/channel.c @@ -47,7 +47,7 @@ # define sock_write(sd, buf, len) write(sd, buf, len) # define sock_read(sd, buf, len) read(sd, buf, len) # define sock_close(sd) close(sd) -# define fd_read(fd, buf, len, timeout) read(fd, buf, len) +# define fd_read(fd, buf, len) read(fd, buf, len) # define fd_write(sd, buf, len) write(sd, buf, len) # define fd_close(sd) close(sd) #endif @@ -58,7 +58,7 @@ extern HWND s_hwnd; /* Gvim's Window handle */ #ifdef WIN32 static int -fd_read(sock_T fd, char_u *buf, size_t len, int timeout) +fd_read(sock_T fd, char_u *buf, size_t len) { HANDLE h = (HANDLE)fd; DWORD nread; @@ -1504,7 +1504,7 @@ channel_read(channel_T *channel, int which, char *func) if (use_socket) len = sock_read(fd, buf, MAXMSGSIZE); else - len = fd_read(fd, buf, MAXMSGSIZE, channel->ch_timeout); + len = fd_read(fd, buf, MAXMSGSIZE); if (len <= 0) break; /* error or nothing more to read */ diff --git a/src/version.c b/src/version.c index fc1c8824d..93d381fca 100644 --- a/src/version.c +++ b/src/version.c @@ -748,6 +748,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1330, +/**/ 1329, /**/ 1328, |