diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-06-20 11:23:01 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-06-20 11:23:01 +0100 |
| commit | 509ce0383105d5b516ef2d489adb7c554d3c8f81 (patch) | |
| tree | 94a50d253d6b88ec24322862827e75065b682216 | |
| parent | d799daa660b8821943cbe1682f00da9e812dd48c (diff) | |
| download | vim-git-509ce0383105d5b516ef2d489adb7c554d3c8f81.tar.gz | |
patch 8.2.5137: cannot build without the +channel featurev8.2.5137
Problem: Cannot build without the +channel feature. (Dominique Pellé)
Solution: Add #ifdef around ch_log() calls. (closes #10598)
| -rw-r--r-- | src/os_unix.c | 2 | ||||
| -rw-r--r-- | src/regexp_bt.c | 2 | ||||
| -rw-r--r-- | src/regexp_nfa.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index c0293cefd..947f46f85 100644 --- 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 index c007b8157..f8def10fe 100644 --- 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 index 40e74484e..dd5f8edc3 100644 --- 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 index 467854439..584d9e1b1 100644 --- 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, |