From f46bf5204c3c55d23921b501db21a906d526eb45 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 9 Dec 2020 13:16:13 +0100
Subject: [PATCH] patch 8.2.2118: dead code in the job support
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Problem:    Dead code in the job support. (Dominique Pellé)
Solution:   Define USE_ARGV before checking for it.
---
 src/job.c     | 9 ++++++---
 src/version.c | 2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/job.c b/src/job.c
index 16fc7c767b..aeb2af7b53 100644
--- a/src/job.c
+++ b/src/job.c
@@ -887,6 +887,11 @@ job_any_running()
 }
 #endif
 
+// Unix uses argv[] for the command, other systems use a string.
+#if defined(UNIX)
+# define USE_ARGV
+#endif
+
 #if !defined(USE_ARGV) || defined(PROTO)
 /*
  * Escape one argument for an external command.
@@ -1269,9 +1274,7 @@ job_start(
     char	**argv = NULL;
     int		argc = 0;
     int		i;
-#if defined(UNIX)
-# define USE_ARGV
-#else
+#ifndef USE_ARGV
     garray_T	ga;
 #endif
     jobopt_T	opt;
diff --git a/src/version.c b/src/version.c
index 21d051e05d..7554fb3b7c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2118,
 /**/
     2117,
 /**/
-- 
2.47.2