# HG changeset patch # User Bram Moolenaar # Date 1655721007 -7200 # Node ID c7aa0c46acd5ceb0a1e69f4ca1da58676d5d52c0 # Parent 0eef32b4ebbc4dbdfdbd4eab901f56cfa4c6fa2e patch 8.2.5137: cannot build without the +channel feature Commit: https://github.com/vim/vim/commit/509ce0383105d5b516ef2d489adb7c554d3c8f81 Author: Bram Moolenaar Date: Mon Jun 20 11:23:01 2022 +0100 patch 8.2.5137: cannot build without the +channel feature Problem: Cannot build without the +channel feature. (Dominique Pell?) Solution: Add #ifdef around ch_log() calls. (closes https://github.com/vim/vim/issues/10598) diff --git a/src/os_unix.c b/src/os_unix.c --- a/src/os_unix.c +++ b/src/os_unix.c @@ -8323,8 +8323,10 @@ start_timeout(long msec) timer_created = TRUE; } +# ifdef FEAT_JOB_CHANNEL ch_log(NULL, "setting timeout timer to %d sec %ld nsec", (int)interval.it_value.tv_sec, (long)interval.it_value.tv_nsec); +# endif ret = timer_settime(timer_id, 0, &interval, NULL); if (ret < 0) semsg(_(e_could_not_set_timeout_str), strerror(errno)); diff --git a/src/regexp_bt.c b/src/regexp_bt.c --- a/src/regexp_bt.c +++ b/src/regexp_bt.c @@ -3163,8 +3163,10 @@ bt_did_time_out(int *timed_out) { if (timed_out != NULL) { +# ifdef FEAT_JOB_CHANNEL if (!*timed_out) ch_log(NULL, "BT regexp timed out"); +# endif *timed_out = TRUE; } return TRUE; diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c --- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -4248,8 +4248,10 @@ nfa_did_time_out(void) { if (nfa_timed_out != NULL) { +# ifdef FEAT_JOB_CHANNEL if (!*nfa_timed_out) ch_log(NULL, "NFA regexp timed out"); +# endif *nfa_timed_out = TRUE; } return TRUE; diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 5137, +/**/ 5136, /**/ 5135,