Mercurial > vim
changeset 8674:4a4d5815a974 v7.4.1626
commit https://github.com/vim/vim/commit/580984e026a46ea0c29789897b701057423b4923
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Mar 20 21:17:13 2016 +0100
patch 7.4.1626
Problem: Missing changes to structs.
Solution: Include the changes.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 20 Mar 2016 21:30:05 +0100 |
| parents | ed7251c3e2d3 |
| children | 114f60aadff6 |
| files | src/structs.h src/version.c |
| diffstat | 2 files changed, 14 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/structs.h +++ b/src/structs.h @@ -1319,6 +1319,14 @@ typedef enum MODE_JS } ch_mode_T; +typedef enum { + JIO_PIPE, /* default */ + JIO_NULL, + JIO_FILE, + JIO_BUFFER, + JIO_OUT +} job_io_T; + /* Ordering matters, it is used in for loops: IN is last, only SOCK/OUT/ERR * are polled. */ #define PART_SOCK 0 @@ -1351,6 +1359,7 @@ typedef struct { #endif ch_mode_T ch_mode; + job_io_T ch_io; int ch_timeout; /* request timeout in msec */ readq_T ch_head; /* header for circular raw read queue */ @@ -1384,6 +1393,9 @@ struct channel_S { chanpart_T ch_part[4]; /* info for socket, out, err and in */ + char *ch_hostname; /* only for socket, allocated */ + int ch_port; /* only for socket */ + int ch_error; /* When TRUE an error was reported. Avoids * giving pages full of error messages when * the other side has exited, only mention the @@ -1443,14 +1455,6 @@ struct channel_S { (JO_CALLBACK + JO_OUT_CALLBACK + JO_ERR_CALLBACK + JO_CLOSE_CALLBACK) #define JO_TIMEOUT_ALL (JO_TIMEOUT + JO_OUT_TIMEOUT + JO_ERR_TIMEOUT) -typedef enum { - JIO_PIPE, /* default */ - JIO_NULL, - JIO_FILE, - JIO_BUFFER, - JIO_OUT -} job_io_T; - /* * Options for job and channel commands. */