# HG changeset patch # User Christian Brabandt # Date 1455637507 -3600 # Node ID 0c7f5abe84b8bf402cf4c844226dd7f24002ca65 # Parent 91ee63677ed965fbbca68efccadeaa5cfcf23e41 commit https://github.com/vim/vim/commit/5d54a045989599468b7a971fc354b0cba4e2b09d Author: Bram Moolenaar Date: Tue Feb 16 16:39:51 2016 +0100 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 --- 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 --- 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 */ /**/ + 1335, +/**/ 1334, /**/ 1333,