changeset 7959:fc9ba91a6533 v7.4.1275

commit https://github.com/vim/vim/commit/cb4b01230be26ada92a1622c2278277d59ef2ec1 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Feb 7 14:53:21 2016 +0100 patch 7.4.1275 Problem: Build fails on MS-Windows. Solution: Fix wrong #ifdef.
author Christian Brabandt <cb@256bit.org>
date Sun, 07 Feb 2016 15:00:05 +0100
parents 91b85ecdfd4d
children 34c0c385208c
files src/eval.c src/version.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/eval.c
+++ b/src/eval.c
@@ -8200,7 +8200,7 @@ static struct fst
     {"isdirectory",	1, 1, f_isdirectory},
     {"islocked",	1, 1, f_islocked},
     {"items",		1, 1, f_items},
-#ifdef FEAT_CHANNEL
+#ifdef FEAT_JOB
     {"job_start",	1, 2, f_job_start},
     {"job_status",	1, 1, f_job_status},
     {"job_stop",	1, 1, f_job_stop},
@@ -22168,7 +22168,7 @@ copy_tv(typval_T *from, typval_T *to)
 	    break;
 #endif
 	case VAR_JOB:
-#ifdef FEAT_FLOAT
+#ifdef FEAT_JOB
 	    to->vval.v_job = from->vval.v_job;
 	    ++to->vval.v_job->jv_refcount;
 	    break;
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1275,
+/**/
     1274,
 /**/
     1273,