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 #10598)
diff --git a/src/os_unix.c b/src/os_unix.c
index c0293ce..947f46f 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -8323,8 +8323,10 @@
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 c007b81..f8def10 100644
--- a/src/regexp_bt.c
+++ b/src/regexp_bt.c
@@ -3163,8 +3163,10 @@
{
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 40e7448..dd5f8ed 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -4248,8 +4248,10 @@
{
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 4678544..584d9e1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 5137,
+/**/
5136,
/**/
5135,