Skip to content

Commit 580984e

Browse files
committed
patch 7.4.1626
Problem: Missing changes to structs. Solution: Include the changes.
1 parent e18c0b3 commit 580984e

2 files changed

Lines changed: 14 additions & 8 deletions

File tree

src/structs.h

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1319,6 +1319,14 @@ typedef enum
13191319
MODE_JS
13201320
} ch_mode_T;
13211321

1322+
typedef enum {
1323+
JIO_PIPE, /* default */
1324+
JIO_NULL,
1325+
JIO_FILE,
1326+
JIO_BUFFER,
1327+
JIO_OUT
1328+
} job_io_T;
1329+
13221330
/* Ordering matters, it is used in for loops: IN is last, only SOCK/OUT/ERR
13231331
* are polled. */
13241332
#define PART_SOCK 0
@@ -1351,6 +1359,7 @@ typedef struct {
13511359
#endif
13521360

13531361
ch_mode_T ch_mode;
1362+
job_io_T ch_io;
13541363
int ch_timeout; /* request timeout in msec */
13551364

13561365
readq_T ch_head; /* header for circular raw read queue */
@@ -1384,6 +1393,9 @@ struct channel_S {
13841393

13851394
chanpart_T ch_part[4]; /* info for socket, out, err and in */
13861395

1396+
char *ch_hostname; /* only for socket, allocated */
1397+
int ch_port; /* only for socket */
1398+
13871399
int ch_error; /* When TRUE an error was reported. Avoids
13881400
* giving pages full of error messages when
13891401
* the other side has exited, only mention the
@@ -1443,14 +1455,6 @@ struct channel_S {
14431455
(JO_CALLBACK + JO_OUT_CALLBACK + JO_ERR_CALLBACK + JO_CLOSE_CALLBACK)
14441456
#define JO_TIMEOUT_ALL (JO_TIMEOUT + JO_OUT_TIMEOUT + JO_ERR_TIMEOUT)
14451457

1446-
typedef enum {
1447-
JIO_PIPE, /* default */
1448-
JIO_NULL,
1449-
JIO_FILE,
1450-
JIO_BUFFER,
1451-
JIO_OUT
1452-
} job_io_T;
1453-
14541458
/*
14551459
* Options for job and channel commands.
14561460
*/

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -748,6 +748,8 @@ static char *(features[]) =
748748

749749
static int included_patches[] =
750750
{ /* Add new patch number below this line */
751+
/**/
752+
1626,
751753
/**/
752754
1625,
753755
/**/

0 commit comments

Comments
 (0)