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 c0293cefdcca8ab8f3c3cbad5f8bde767f5a5458..947f46f856ebb3e8fcf3084a59b8903c8f62cd65 100644 (file)
--- 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 c007b8157fd8e9c7293788668d37f20f40ce577a..f8def10fe384b0a15254782683e70a15272c10d1 100644 (file)
--- 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 40e74484ea21fbc0daf5d10aa97520441a97923f..dd5f8edc383ccfe45268ac898958b638e3350348 100644 (file)
--- 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 467854439de0b7c59e6b8931244ed4a90128b023..584d9e1b197bdf96dc2a9e1b79e97d8b6152e65f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    5137,
 /**/
     5136,
 /**/