Skip to content

Commit 5d54a04

Browse files
committed
patch 7.4.1335
Problem: Can't build on MS-Windows with +job but without +channel. (Cesar Romani) Solution: Add #ifdefs. (Yasuhiro Matsumoto)
1 parent 6aa2cd4 commit 5d54a04

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

src/os_win32.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5071,6 +5071,7 @@ mch_start_job(char *cmd, job_T *job)
50715071
si.dwFlags |= STARTF_USESHOWWINDOW;
50725072
si.wShowWindow = SW_HIDE;
50735073

5074+
# ifdef FEAT_CHANNEL
50745075
saAttr.nLength = sizeof(SECURITY_ATTRIBUTES);
50755076
saAttr.bInheritHandle = TRUE;
50765077
saAttr.lpSecurityDescriptor = NULL;
@@ -5085,6 +5086,7 @@ mch_start_job(char *cmd, job_T *job)
50855086
si.hStdInput = ifd[0];
50865087
si.hStdOutput = ofd[1];
50875088
si.hStdError = efd[1];
5089+
# endif
50885090

50895091
if (!vim_create_process(cmd, TRUE,
50905092
CREATE_SUSPENDED |
@@ -5111,11 +5113,11 @@ mch_start_job(char *cmd, job_T *job)
51115113
job->jv_job_object = jo;
51125114
job->jv_status = JOB_STARTED;
51135115

5116+
# ifdef FEAT_CHANNEL
51145117
CloseHandle(ifd[0]);
51155118
CloseHandle(ofd[1]);
51165119
CloseHandle(efd[1]);
51175120

5118-
# ifdef FEAT_CHANNEL
51195121
job->jv_channel = channel;
51205122
channel_set_pipes(channel, (sock_T)ifd[1], (sock_T)ofd[0], (sock_T)efd[0]);
51215123
channel_set_job(channel, job);

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -747,6 +747,8 @@ static char *(features[]) =
747747

748748
static int included_patches[] =
749749
{ /* Add new patch number below this line */
750+
/**/
751+
1335,
750752
/**/
751753
1334,
752754
/**/

0 commit comments

Comments
 (0)