Skip to content

Commit fa4bce7

Browse files
committed
patch 7.4.1316
Problem: Can't build MS-Windows console version. (Tux) Solution: Add #ifdefs.
1 parent 7707344 commit fa4bce7

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

src/eval.c

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,9 @@ static void f_isdirectory(typval_T *argvars, typval_T *rettv);
627627
static void f_islocked(typval_T *argvars, typval_T *rettv);
628628
static void f_items(typval_T *argvars, typval_T *rettv);
629629
#ifdef FEAT_JOB
630+
# ifdef FEAT_CHANNEL
630631
static void f_job_getchannel(typval_T *argvars, typval_T *rettv);
632+
# endif
631633
static void f_job_start(typval_T *argvars, typval_T *rettv);
632634
static void f_job_stop(typval_T *argvars, typval_T *rettv);
633635
static void f_job_status(typval_T *argvars, typval_T *rettv);
@@ -7741,13 +7743,15 @@ channel_unref(channel_T *channel)
77417743
static void
77427744
job_free(job_T *job)
77437745
{
7746+
# ifdef FEAT_CHANNEL
77447747
if (job->jv_channel != NULL)
77457748
{
77467749
/* The channel doesn't count as a references for the job, we need to
77477750
* NULL the reference when the job is freed. */
77487751
job->jv_channel->ch_job = NULL;
77497752
channel_unref(job->jv_channel);
77507753
}
7754+
# endif
77517755
mch_clear_job(job);
77527756
vim_free(job);
77537757
}
@@ -8238,7 +8242,9 @@ static struct fst
82388242
{"islocked", 1, 1, f_islocked},
82398243
{"items", 1, 1, f_items},
82408244
#ifdef FEAT_JOB
8245+
# ifdef FEAT_CHANNEL
82418246
{"job_getchannel", 1, 1, f_job_getchannel},
8247+
# endif
82428248
{"job_start", 1, 2, f_job_start},
82438249
{"job_status", 1, 1, f_job_status},
82448250
{"job_stop", 1, 2, f_job_stop},
@@ -10747,7 +10753,7 @@ f_empty(typval_T *argvars, typval_T *rettv)
1074710753
break;
1074810754
#endif
1074910755
case VAR_CHANNEL:
10750-
#ifdef FEAT_CMDWIN
10756+
#ifdef FEAT_CHANNEL
1075110757
n = argvars[0].vval.v_channel == NULL
1075210758
|| !channel_is_open(argvars[0].vval.v_channel);
1075310759
break;
@@ -14395,6 +14401,8 @@ f_items(typval_T *argvars, typval_T *rettv)
1439514401
}
1439614402

1439714403
#ifdef FEAT_JOB
14404+
14405+
# ifdef FEAT_CHANNEL
1439814406
/*
1439914407
* "job_getchannel()" function
1440014408
*/
@@ -14413,6 +14421,7 @@ f_job_getchannel(typval_T *argvars, typval_T *rettv)
1441314421
++job->jv_channel->ch_refcount;
1441414422
}
1441514423
}
14424+
# endif
1441614425

1441714426
/*
1441814427
* "job_start()" function

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -747,6 +747,8 @@ static char *(features[]) =
747747

748748
static int included_patches[] =
749749
{ /* Add new patch number below this line */
750+
/**/
751+
1316,
750752
/**/
751753
1315,
752754
/**/

0 commit comments

Comments
 (0)