patch 7.4.1335

Problem:    Can't build on MS-Windows with +job but without +channel. (Cesar
            Romani)
Solution:   Add #ifdefs. (Yasuhiro Matsumoto)

diff --git a/src/os_win32.c b/src/os_win32.c
index 0c252ac8d17516f9b173075ab439a131b23d3773..4fd117f9ef8e7529e7dc2f5b3673f55c2c7cc2ea 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -5071,6 +5071,7 @@ mch_start_job(char *cmd, job_T *job)
     si.dwFlags |= STARTF_USESHOWWINDOW;
     si.wShowWindow = SW_HIDE;
 
+# ifdef FEAT_CHANNEL
     saAttr.nLength = sizeof(SECURITY_ATTRIBUTES);
     saAttr.bInheritHandle = TRUE;
     saAttr.lpSecurityDescriptor = NULL;
@@ -5085,6 +5086,7 @@ mch_start_job(char *cmd, job_T *job)
     si.hStdInput = ifd[0];
     si.hStdOutput = ofd[1];
     si.hStdError = efd[1];
+# endif
 
     if (!vim_create_process(cmd, TRUE,
            CREATE_SUSPENDED |
@@ -5111,11 +5113,11 @@ mch_start_job(char *cmd, job_T *job)
     job->jv_job_object = jo;
     job->jv_status = JOB_STARTED;
 
+# ifdef FEAT_CHANNEL
     CloseHandle(ifd[0]);
     CloseHandle(ofd[1]);
     CloseHandle(efd[1]);
 
-# ifdef FEAT_CHANNEL
     job->jv_channel = channel;
     channel_set_pipes(channel, (sock_T)ifd[1], (sock_T)ofd[0], (sock_T)efd[0]);
     channel_set_job(channel, job);

diff --git a/src/version.c b/src/version.c
index 481701ac3d763ceed0e7863fe2be9979d2998c30..15d40bb6509ae7025bc21fa693e8d7872ea50db2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1335,
 /**/
     1334,
 /**/