patch 7.4.1626

Problem:    Missing changes to structs.
Solution:   Include the changes.

diff --git a/src/structs.h b/src/structs.h
index 85223a0ce55f122158306f46a1d2a2e62814481c..97eae57be3723391a352864d0af480f2e4cb580d 100644 (file)
--- 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 7e1b515ab445a44d0c9bcd3b0804a943691a4654..fee3370d2ba2fc7e0ccbcae60bb3dbfce30ac260 100644 (file)
--- 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 */
+/**/
+    1626,
 /**/
     1625,
 /**/