diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-03-20 21:17:13 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-03-20 21:17:13 +0100 |
| commit | 580984e026a46ea0c29789897b701057423b4923 (patch) | |
| tree | 7fcb4008cf3c0cb0451f0c6461aa2d3ec4cbd024 | |
| parent | e18c0b39815c5a746887a509c2cd9f11fadaba07 (diff) | |
| download | vim-git-580984e026a46ea0c29789897b701057423b4923.tar.gz | |
patch 7.4.1626v7.4.1626
Problem: Missing changes to structs.
Solution: Include the changes.
| -rw-r--r-- | src/structs.h | 20 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 14 insertions, 8 deletions
diff --git a/src/structs.h b/src/structs.h index 85223a0ce..97eae57be 100644 --- 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. */ diff --git a/src/version.c b/src/version.c index 7e1b515ab..fee3370d2 100644 --- a/src/version.c +++ b/src/version.c @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1626, +/**/ 1625, /**/ 1624, |