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>

diff --git a/src/misc2.c b/src/misc2.c
index 2056700e4f00acfcb0820a074ec9c45d82d7cbfe..a7f52e55ebc0a2d63f8b4a0013f09f924b4cae21 100644 (file)
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -3095,7 +3095,9 @@ build_argv_from_string(char_u *cmd, char ***argv, int *argc)
     return OK;
 }
 
-# if defined(FEAT_JOB_CHANNEL)
+#endif
+
+#if defined(FEAT_EVAL)
 /*
  * Build "argv[argc]" from the list "l".
  * "argv[argc]" is set to NULL;
@@ -3130,7 +3132,6 @@ build_argv_from_list(list_T *l, char ***argv, int *argc)
     (*argv)[*argc] = NULL;
     return OK;
 }
-# endif
 #endif
 
 /*

diff --git a/src/os_win32.c b/src/os_win32.c
index 3d5b095c3cc4deddc2c5ece589c452e53ee2e797..431d3b5482a74182ba96b248dc857da109ab4a04 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -5960,7 +5960,9 @@ create_pipe_pair(HANDLE handles[2])
     return TRUE;
 }
 
-# if defined(FEAT_EVAL)
+#endif // FEAT_JOB_CHANNEL
+
+#if defined(FEAT_EVAL)
 /*
  * Execute "argv" directly without the shell and return the output.
  * Used by system() and systemlist() when the command is a List.
@@ -6171,8 +6173,9 @@ done:
        CloseHandle(hChildStdinRd);
     return buffer;
 }
-# endif
+#endif // FEAT_EVAL
 
+#if defined(FEAT_JOB_CHANNEL)
     void
 mch_job_start(char *cmd, job_T *job, jobopt_T *options)
 {

diff --git a/src/version.c b/src/version.c
index f761cbd30cb0befaba02aaf0ed9e44a5bb689ac3..862b5b12ae0d8e6751135b03e162a41469abfbe3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    251,
 /**/
     250,
 /**/