patch 7.4.1275

Problem:    Build fails on MS-Windows.
Solution:   Fix wrong #ifdef.

diff --git a/src/eval.c b/src/eval.c
index 833c41c04a5b669239eef1070885110635347bb9..f295d3634c9159f2b1c32b1cc10b977fcff2bb8c 100644 (file)
--- 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;

diff --git a/src/version.c b/src/version.c
index ddd733dc2f3e68eb56f0022b4a7d8ddaf4217c31..a3c27cdd5393c24d405ef45ff73be6b6265f3716 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1275,
 /**/
     1274,
 /**/