diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-02-07 14:53:21 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-02-07 14:53:21 +0100 |
commit | cb4b01230be26ada92a1622c2278277d59ef2ec1 (patch) | |
tree | 37a2477d1b63cb47104e0baf1100870bf63e8146 /src | |
parent | 835dc636a5350f610b62f110227d2363b5b2880a (diff) | |
download | vim-git-cb4b01230be26ada92a1622c2278277d59ef2ec1.tar.gz |
patch 7.4.1275v7.4.1275
Problem: Build fails on MS-Windows.
Solution: Fix wrong #ifdef.
Diffstat (limited to 'src')
-rw-r--r-- | src/eval.c | 4 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/eval.c b/src/eval.c index 833c41c04..f295d3634 100644 --- 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 ddd733dc2..a3c27cdd5 100644 --- 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, |