From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 16 Feb 2016 15:39:51 +0000 (+0100)
Subject: patch 7.4.1335
X-Git-Tag: v7.4.1335
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d54a045989599468b7a971fc354b0cba4e2b09d;p=thirdparty%2Fvim.git

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 0c252ac8d1..4fd117f9ef 100644
--- 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 481701ac3d..15d40bb650 100644
--- 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,
 /**/