Mercurial > vim

changeset 8314:4e057409f1d7 v7.4.1449

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/8cc6977a9655603bfc4aab64edddafef147da65e Author: Bram Moolenaar <Bram@vim.org> Date: Sun Feb 28 16:42:03 2016 +0100 patch 7.4.1449 Problem: Build fails with job feature but without channel feature. Solution: Add #ifdef.
author Christian Brabandt <cb@256bit.org>
date Sun, 28 Feb 2016 16:45:04 +0100
parents 973c585fee01
children f99a8437cbd1
files src/eval.c src/version.c
diffstat 2 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
     }
 }
 
--- 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,