Skip to content

Commit f46bf52

Browse files
committed
patch 8.2.2118: dead code in the job support
Problem: Dead code in the job support. (Dominique Pellé) Solution: Define USE_ARGV before checking for it.
1 parent 7bb4e74 commit f46bf52

2 files changed

Lines changed: 8 additions & 3 deletions

File tree

src/job.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -887,6 +887,11 @@ job_any_running()
887887
}
888888
#endif
889889

890+
// Unix uses argv[] for the command, other systems use a string.
891+
#if defined(UNIX)
892+
# define USE_ARGV
893+
#endif
894+
890895
#if !defined(USE_ARGV) || defined(PROTO)
891896
/*
892897
* Escape one argument for an external command.
@@ -1269,9 +1274,7 @@ job_start(
12691274
char **argv = NULL;
12701275
int argc = 0;
12711276
int i;
1272-
#if defined(UNIX)
1273-
# define USE_ARGV
1274-
#else
1277+
#ifndef USE_ARGV
12751278
garray_T ga;
12761279
#endif
12771280
jobopt_T opt;

src/version.c

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

751751
static int included_patches[] =
752752
{ /* Add new patch number below this line */
753+
/**/
754+
2118,
753755
/**/
754756
2117,
755757
/**/

0 commit comments

Comments
 (0)