aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 7.4.1495

Browse Source 
Problem:    Compiler warnings when building on Unix with the job feature but
            without the channel feature.
Solution:   Move #ifdefs. (Dominique Pelle)
This commit is contained in:
Bram Moolenaar
2016-03-05 22:05:27 +01:00
parent 119d4693e0
commit 802d559431
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/os_unix.c
View File

@@ -5037,16 +5037,15 @@ error:
#if defined(FEAT_JOB) || defined(PROTO) #if defined(FEAT_JOB) || defined(PROTO)
void void
mch_start_job(char **argv, job_T *job, jobopt_T *options) mch_start_job(char **argv, job_T *job, jobopt_T *options UNUSED)
{ {
pid_t pid; pid_t pid;
# ifdef FEAT_CHANNEL
int fd_in[2]; /* for stdin */ int fd_in[2]; /* for stdin */
int fd_out[2]; /* for stdout */ int fd_out[2]; /* for stdout */
int fd_err[2]; /* for stderr */ int fd_err[2]; /* for stderr */
# ifdef FEAT_CHANNEL
channel_T *channel = NULL; channel_T *channel = NULL;
int use_out_for_err = options->jo_io[PART_ERR] == JIO_OUT; int use_out_for_err = options->jo_io[PART_ERR] == JIO_OUT;
#endif
/* default is to fail */ /* default is to fail */
job->jv_status = JOB_FAILED; job->jv_status = JOB_FAILED;
@@ -5055,7 +5054,6 @@ mch_start_job(char **argv, job_T *job, jobopt_T *options)
fd_err[0] = -1; fd_err[0] = -1;
/* TODO: without the channel feature connect the child to /dev/null? */ /* TODO: without the channel feature connect the child to /dev/null? */
# ifdef FEAT_CHANNEL
/* Open pipes for stdin, stdout, stderr. */ /* Open pipes for stdin, stdout, stderr. */
if (pipe(fd_in) < 0 || pipe(fd_out) < 0 if (pipe(fd_in) < 0 || pipe(fd_out) < 0
|| (!use_out_for_err && pipe(fd_err) < 0)) || (!use_out_for_err && pipe(fd_err) < 0))
@@ -5114,7 +5112,6 @@ mch_start_job(char **argv, job_T *job, jobopt_T *options)
close(1); close(1);
ignored = dup(fd_out[1]); ignored = dup(fd_out[1]);
close(fd_out[1]); close(fd_out[1]);
# endif # endif
/* See above for type of argv. */ /* See above for type of argv. */
@@ -5131,14 +5128,12 @@ mch_start_job(char **argv, job_T *job, jobopt_T *options)
job->jv_channel = channel; job->jv_channel = channel;
# endif # endif
# ifdef FEAT_CHANNEL
/* child stdin, stdout and stderr */ /* child stdin, stdout and stderr */
close(fd_in[0]); close(fd_in[0]);
close(fd_out[1]); close(fd_out[1]);
# ifdef FEAT_CHANNEL
if (!use_out_for_err) if (!use_out_for_err)
# endif
close(fd_err[1]); close(fd_err[1]);
# ifdef FEAT_CHANNEL
channel_set_pipes(channel, fd_in[1], fd_out[0], channel_set_pipes(channel, fd_in[1], fd_out[0],
use_out_for_err ? INVALID_FD : fd_err[0]); use_out_for_err ? INVALID_FD : fd_err[0]);
channel_set_job(channel, job, options); channel_set_job(channel, job, options);
@@ -5149,11 +5144,10 @@ mch_start_job(char **argv, job_T *job, jobopt_T *options)
return; return;
failed: failed: ;
# ifdef FEAT_CHANNEL # ifdef FEAT_CHANNEL
if (channel != NULL) if (channel != NULL)
channel_free(channel); channel_free(channel);
# endif
if (fd_in[0] >= 0) if (fd_in[0] >= 0)
{ {
close(fd_in[0]); close(fd_in[0]);
@@ -5169,6 +5163,7 @@ failed:
close(fd_err[0]); close(fd_err[0]);
close(fd_err[1]); close(fd_err[1]);
} }
# endif
} }
char * char *

2
src/version.c
View File

@@ -743,6 +743,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 */
/**/
1495,
/**/ /**/
1494, 1494,
/**/ /**/