Skip to content

Commit 68b3585

Browse files
mattnchrisbra
authored andcommitted
patch 9.2.0251: Link error when building without channel feature
Problem: Compile error when building without channel feature (John Marriott, after v9.2.0250) Solution: Update ifdefs and move implementation out of FEAT_JOB_CHANNEL (Yasuhiro Matsumoto) Move build_argv_from_list() and mch_get_cmd_output_direct() out of FEAT_JOB_CHANNEL guards so that system() with a List argument works in builds that have FEAT_EVAL but not FEAT_JOB_CHANNEL (e.g. FEAT_NORMAL without GUI). related: #19791 closes: #19826 Signed-off-by: Yasuhiro Matsumoto <mattn.jp@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
1 parent c84526d commit 68b3585

3 files changed

Lines changed: 10 additions & 4 deletions

File tree

src/misc2.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3095,7 +3095,9 @@ build_argv_from_string(char_u *cmd, char ***argv, int *argc)
30953095
return OK;
30963096
}
30973097

3098-
# if defined(FEAT_JOB_CHANNEL)
3098+
#endif
3099+
3100+
#if defined(FEAT_EVAL)
30993101
/*
31003102
* Build "argv[argc]" from the list "l".
31013103
* "argv[argc]" is set to NULL;
@@ -3130,7 +3132,6 @@ build_argv_from_list(list_T *l, char ***argv, int *argc)
31303132
(*argv)[*argc] = NULL;
31313133
return OK;
31323134
}
3133-
# endif
31343135
#endif
31353136

31363137
/*

src/os_win32.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5960,7 +5960,9 @@ create_pipe_pair(HANDLE handles[2])
59605960
return TRUE;
59615961
}
59625962

5963-
# if defined(FEAT_EVAL)
5963+
#endif // FEAT_JOB_CHANNEL
5964+
5965+
#if defined(FEAT_EVAL)
59645966
/*
59655967
* Execute "argv" directly without the shell and return the output.
59665968
* Used by system() and systemlist() when the command is a List.
@@ -6171,8 +6173,9 @@ mch_get_cmd_output_direct(
61716173
CloseHandle(hChildStdinRd);
61726174
return buffer;
61736175
}
6174-
# endif
6176+
#endif // FEAT_EVAL
61756177

6178+
#if defined(FEAT_JOB_CHANNEL)
61766179
void
61776180
mch_job_start(char *cmd, job_T *job, jobopt_T *options)
61786181
{

src/version.c

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

735735
static int included_patches[] =
736736
{ /* Add new patch number below this line */
737+
/**/
738+
251,
737739
/**/
738740
250,
739741
/**/

0 commit comments

Comments
 (0)