Mercurial > vim
diff src/proto/channel.pro @ 8049:15253130abd8 v7.4.1319
commit https://github.com/vim/vim/commit/16eb4f88000cfdba68df6c421fe44e7e029ba53e
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Feb 14 23:02:34 2016 +0100
patch 7.4.1319
Problem: Tests fail on MS-Windows and on Unix with GUI.
Solution: Fix unregistering.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 14 Feb 2016 23:15:04 +0100 |
| parents | 7c74cafac0a1 |
| children | 19304db153bc |
line wrap: on
line diff
--- a/src/proto/channel.pro +++ b/src/proto/channel.pro @@ -22,10 +22,10 @@ char_u *channel_peek(channel_T *channel) void channel_clear(channel_T *channel); void channel_free_all(void); int channel_get_id(void); -void channel_read(channel_T *channel, int what, char *func); +void channel_read(channel_T *channel, int which, char *func); char_u *channel_read_block(channel_T *channel); int channel_read_json_block(channel_T *channel, int id, typval_T **rettv); -channel_T *channel_fd2channel(sock_T fd, int *what); +channel_T *channel_fd2channel(sock_T fd, int *whichp); int channel_send(channel_T *channel, char_u *buf, char *fun); int channel_poll_setup(int nfd_in, void *fds_in); int channel_poll_check(int ret_in, void *fds_in);