From: Bram Moolenaar Date: Wed, 11 Jan 2023 19:11:15 +0000 (+0000) Subject: patch 9.0.1180: compiler warnings without the +job feature X-Git-Tag: v9.0.1180 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcbfaf32e02a92a6d6d35fc409b1b16aa931e3fa;p=thirdparty%2Fvim.git patch 9.0.1180: compiler warnings without the +job feature Problem: Compiler warnings without the +job feature. Solution: Adjust #ifdefs. (John Marriott) --- diff --git a/src/eval.c b/src/eval.c index a6eceff0be..2a8b1c52ee 100644 --- a/src/eval.c +++ b/src/eval.c @@ -5580,6 +5580,7 @@ set_ref_in_item_partial( return abort; } +#ifdef FEAT_JOB_CHANNEL /* * Mark the job "pt" with "copyID". * Also see set_ref_in_item(). @@ -5591,7 +5592,6 @@ set_ref_in_item_job( ht_stack_T **ht_stack, list_stack_T **list_stack) { -#ifdef FEAT_JOB_CHANNEL typval_T dtv; if (job == NULL || job->jv_copyID == copyID) @@ -5610,7 +5610,6 @@ set_ref_in_item_job( dtv.vval.v_partial = job->jv_exit_cb.cb_partial; set_ref_in_item(&dtv, copyID, ht_stack, list_stack); } -#endif return FALSE; } @@ -5626,7 +5625,6 @@ set_ref_in_item_channel( ht_stack_T **ht_stack, list_stack_T **list_stack) { -#ifdef FEAT_JOB_CHANNEL typval_T dtv; if (ch == NULL || ch->ch_copyID == copyID) @@ -5665,10 +5663,10 @@ set_ref_in_item_channel( dtv.vval.v_partial = ch->ch_close_cb.cb_partial; set_ref_in_item(&dtv, copyID, ht_stack, list_stack); } -#endif return FALSE; } +#endif /* * Mark the class "cl" with "copyID". @@ -5770,12 +5768,20 @@ set_ref_in_item( ht_stack, list_stack); case VAR_JOB: +#ifdef FEAT_JOB_CHANNEL return set_ref_in_item_job(tv->vval.v_job, copyID, ht_stack, list_stack); +#else + break; +#endif case VAR_CHANNEL: +#ifdef FEAT_JOB_CHANNEL return set_ref_in_item_channel(tv->vval.v_channel, copyID, ht_stack, list_stack); +#else + break; +#endif case VAR_CLASS: return set_ref_in_item_class(tv->vval.v_class, copyID, diff --git a/src/version.c b/src/version.c index b16a3f7577..5036e070ef 100644 --- a/src/version.c +++ b/src/version.c @@ -695,6 +695,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1180, /**/ 1179, /**/