To: vim_dev@googlegroups.com Subject: Patch 9.0.1180 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.1180 (after 9.0.1175) Problem: Compiler warnings without the +job feature. Solution: Adjust #ifdefs. (John Marriott) Files: src/eval.c *** ../vim-9.0.1179/src/eval.c 2023-01-11 11:46:15.065636518 +0000 --- src/eval.c 2023-01-11 19:08:44.952812349 +0000 *************** *** 5580,5585 **** --- 5580,5586 ---- return abort; } + #ifdef FEAT_JOB_CHANNEL /* * Mark the job "pt" with "copyID". * Also see set_ref_in_item(). *************** *** 5591,5597 **** ht_stack_T **ht_stack, list_stack_T **list_stack) { - #ifdef FEAT_JOB_CHANNEL typval_T dtv; if (job == NULL || job->jv_copyID == copyID) --- 5592,5597 ---- *************** *** 5610,5616 **** dtv.vval.v_partial = job->jv_exit_cb.cb_partial; set_ref_in_item(&dtv, copyID, ht_stack, list_stack); } - #endif return FALSE; } --- 5610,5615 ---- *************** *** 5626,5632 **** ht_stack_T **ht_stack, list_stack_T **list_stack) { - #ifdef FEAT_JOB_CHANNEL typval_T dtv; if (ch == NULL || ch->ch_copyID == copyID) --- 5625,5630 ---- *************** *** 5665,5674 **** dtv.vval.v_partial = ch->ch_close_cb.cb_partial; set_ref_in_item(&dtv, copyID, ht_stack, list_stack); } - #endif return FALSE; } /* * Mark the class "cl" with "copyID". --- 5663,5672 ---- dtv.vval.v_partial = ch->ch_close_cb.cb_partial; set_ref_in_item(&dtv, copyID, ht_stack, list_stack); } return FALSE; } + #endif /* * Mark the class "cl" with "copyID". *************** *** 5770,5781 **** --- 5768,5787 ---- 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, *** ../vim-9.0.1179/src/version.c 2023-01-11 17:59:35.114319167 +0000 --- src/version.c 2023-01-11 19:11:01.020760496 +0000 *************** *** 697,698 **** --- 697,700 ---- { /* Add new patch number below this line */ + /**/ + 1180, /**/ -- Female engineers become irresistible at the age of consent and remain that way until about thirty minutes after their clinical death. Longer if it's a warm day. (Scott Adams - The Dilbert principle) /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///