From: Bram Moolenaar Date: Sun, 28 Feb 2016 15:42:03 +0000 (+0100) Subject: patch 7.4.1449 X-Git-Tag: v7.4.1449 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cc6977a9655603bfc4aab64edddafef147da65e;p=thirdparty%2Fvim.git patch 7.4.1449 Problem: Build fails with job feature but without channel feature. Solution: Add #ifdef. --- diff --git a/src/eval.c b/src/eval.c index c12961aa78..4dd400ad98 100644 --- a/src/eval.c +++ b/src/eval.c @@ -7800,6 +7800,7 @@ job_unref(job_T *job) { job_free(job); } +# ifdef FEAT_CHANNEL else if (job->jv_channel != NULL) { /* Do remove the link to the channel, otherwise it hangs @@ -7808,6 +7809,7 @@ job_unref(job_T *job) channel_unref(job->jv_channel); job->jv_channel = NULL; } +# endif } } diff --git a/src/version.c b/src/version.c index eaf0ab6226..8853a78488 100644 --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1449, /**/ 1448, /**/