aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 7.4.1316

Browse Source 
Problem:    Can't build MS-Windows console version. (Tux)
Solution:   Add #ifdefs.
This commit is contained in:
Bram Moolenaar 2016-02-13 23:50:08 +01:00
parent 7707344dde
commit fa4bce7dd2
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/eval.c
View File

@ -627,7 +627,9 @@ static void f_isdirectory(typval_T *argvars, typval_T *rettv);
static void f_islocked(typval_T *argvars, typval_T *rettv); static void f_islocked(typval_T *argvars, typval_T *rettv);
static void f_items(typval_T *argvars, typval_T *rettv); static void f_items(typval_T *argvars, typval_T *rettv);
#ifdef FEAT_JOB #ifdef FEAT_JOB
# ifdef FEAT_CHANNEL
static void f_job_getchannel(typval_T *argvars, typval_T *rettv); static void f_job_getchannel(typval_T *argvars, typval_T *rettv);
# endif
static void f_job_start(typval_T *argvars, typval_T *rettv); static void f_job_start(typval_T *argvars, typval_T *rettv);
static void f_job_stop(typval_T *argvars, typval_T *rettv); static void f_job_stop(typval_T *argvars, typval_T *rettv);
static void f_job_status(typval_T *argvars, typval_T *rettv); static void f_job_status(typval_T *argvars, typval_T *rettv);
@ -7741,6 +7743,7 @@ channel_unref(channel_T *channel)
static void static void
job_free(job_T *job) job_free(job_T *job)
{ {
# ifdef FEAT_CHANNEL
if (job->jv_channel != NULL) if (job->jv_channel != NULL)
{ {
/* The channel doesn't count as a references for the job, we need to /* The channel doesn't count as a references for the job, we need to
@ -7748,6 +7751,7 @@ job_free(job_T *job)
job->jv_channel->ch_job = NULL; job->jv_channel->ch_job = NULL;
channel_unref(job->jv_channel); channel_unref(job->jv_channel);
} }
# endif
mch_clear_job(job); mch_clear_job(job);
vim_free(job); vim_free(job);
} }
@ -8238,7 +8242,9 @@ static struct fst
{"islocked", 1, 1, f_islocked}, {"islocked", 1, 1, f_islocked},
{"items", 1, 1, f_items}, {"items", 1, 1, f_items},
#ifdef FEAT_JOB #ifdef FEAT_JOB
# ifdef FEAT_CHANNEL
{"job_getchannel", 1, 1, f_job_getchannel}, {"job_getchannel", 1, 1, f_job_getchannel},
# endif
{"job_start", 1, 2, f_job_start}, {"job_start", 1, 2, f_job_start},
{"job_status", 1, 1, f_job_status}, {"job_status", 1, 1, f_job_status},
{"job_stop", 1, 2, f_job_stop}, {"job_stop", 1, 2, f_job_stop},
@ -10747,7 +10753,7 @@ f_empty(typval_T *argvars, typval_T *rettv)
break; break;
#endif #endif
case VAR_CHANNEL: case VAR_CHANNEL:
#ifdef FEAT_CMDWIN #ifdef FEAT_CHANNEL
n = argvars[0].vval.v_channel == NULL n = argvars[0].vval.v_channel == NULL
|| !channel_is_open(argvars[0].vval.v_channel); || !channel_is_open(argvars[0].vval.v_channel);
break; break;
@ -14395,6 +14401,8 @@ f_items(typval_T *argvars, typval_T *rettv)
} }
#ifdef FEAT_JOB #ifdef FEAT_JOB
# ifdef FEAT_CHANNEL
/* /*
* "job_getchannel()" function * "job_getchannel()" function
*/ */
@ -14413,6 +14421,7 @@ f_job_getchannel(typval_T *argvars, typval_T *rettv)
++job->jv_channel->ch_refcount; ++job->jv_channel->ch_refcount;
} }
} }
# endif
/* /*
* "job_start()" function * "job_start()" function

2
src/version.c
View File

@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1316,
/**/ /**/
1315, 1315,
/**/ /**/