Mercurial > vim
changeset 8082:0c7f5abe84b8 v7.4.1335
commit https://github.com/vim/vim/commit/5d54a045989599468b7a971fc354b0cba4e2b09d
Author: Bram Moolenaar <Bram@vim.org>
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)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 16 Feb 2016 16:45:07 +0100 |
| parents | 91ee63677ed9 |
| children | 56fcca2c82a2 |
| files | src/os_win32.c src/version.c |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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);