summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-02-28 16:42:03 +0100
committerBram Moolenaar <Bram@vim.org>2016-02-28 16:42:03 +0100
commit8cc6977a9655603bfc4aab64edddafef147da65e (patch)
tree36ba00718940ae1cd6ed3d7c706fac56a7dd4038
parentc5215e943bf5a045089693b60b8805a794d8c2f6 (diff)
downloadvim-git-8cc6977a9655603bfc4aab64edddafef147da65e.tar.gz
patch 7.4.1449v7.4.1449
Problem: Build fails with job feature but without channel feature. Solution: Add #ifdef.
-rw-r--r--src/eval.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c
index c12961aa7..4dd400ad9 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 eaf0ab622..8853a7848 100644
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1449,
+/**/
1448,
/**/
1447,