summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-03-01 19:52:48 +0000
committerBram Moolenaar <Bram@vim.org>2022-03-01 19:52:48 +0000
commitf6b0c79742727948edee78cb1a3a9a4e3be8b0fd (patch)
treefdd766a84170e73333553446d8792c97923da0cc
parent7a2222487507eb13cccdb9a66397092775d62b8c (diff)
downloadvim-git-8.2.4488.tar.gz
patch 8.2.4488: build error with +eval but without +channel or +jobv8.2.4488
Problem: Build error with +eval but without +channel or +job. Solution: Add #ifdef. (John Marriott)
-rw-r--r--src/typval.c4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/typval.c b/src/typval.c
index 775466784..38b81e884 100644
--- a/src/typval.c
+++ b/src/typval.c
@@ -1394,10 +1394,14 @@ typval_compare_null(typval_T *tv1, typval_T *tv2)
switch (tv->v_type)
{
case VAR_BLOB: return tv->vval.v_blob == NULL;
+#ifdef FEAT_JOB_CHANNEL
case VAR_CHANNEL: return tv->vval.v_channel == NULL;
+#endif
case VAR_DICT: return tv->vval.v_dict == NULL;
case VAR_FUNC: return tv->vval.v_string == NULL;
+#ifdef FEAT_JOB_CHANNEL
case VAR_JOB: return tv->vval.v_job == NULL;
+#endif
case VAR_LIST: return tv->vval.v_list == NULL;
case VAR_PARTIAL: return tv->vval.v_partial == NULL;
case VAR_STRING: return tv->vval.v_string == NULL;
diff --git a/src/version.c b/src/version.c
index 960e18cea..3918e7439 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4488,
+/**/
4487,
/**/
4486,