diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-03-11 22:52:15 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-03-11 22:52:15 +0100 |
| commit | 509ce2a558e7e0c03242e32e844255af52f1c821 (patch) | |
| tree | a79ac8c1e42f2f9eefa81016328194a346dade06 /src/structs.h | |
| parent | de27989157f35172b25f9e01e0c147ed8f6ae3ce (diff) | |
| download | vim-git-509ce2a558e7e0c03242e32e844255af52f1c821.tar.gz | |
patch 7.4.1537v7.4.1537
Problem: Too many feature flags for pipes, jobs and channels.
Solution: Only use FEAT_JOB_CHANNEL.
Diffstat (limited to 'src/structs.h')
| -rw-r--r-- | src/structs.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/structs.h b/src/structs.h index 9ccc09a12..6bf21263a 100644 --- a/src/structs.h +++ b/src/structs.h @@ -1147,10 +1147,8 @@ typedef struct char_u *v_string; /* string value (can be NULL!) */ list_T *v_list; /* list value (can be NULL!) */ dict_T *v_dict; /* dict value (can be NULL!) */ -#ifdef FEAT_JOB +#ifdef FEAT_JOB_CHANNEL job_T *v_job; /* job value (can be NULL!) */ -#endif -#ifdef FEAT_CHANNEL channel_T *v_channel; /* channel value (can be NULL!) */ #endif } vval; @@ -1312,8 +1310,7 @@ typedef enum #define PART_SOCK 0 #define CH_SOCK_FD ch_part[PART_SOCK].ch_fd -#if defined(UNIX) || defined(WIN32) -# define CHANNEL_PIPES +#ifdef FEAT_JOB_CHANNEL # define INVALID_FD (-1) # define PART_OUT 1 @@ -2057,7 +2054,7 @@ struct file_buffer int b_netbeans_file; /* TRUE when buffer is owned by NetBeans */ int b_was_netbeans_file;/* TRUE if b_netbeans_file was once set */ #endif -#ifdef FEAT_CHANNEL +#ifdef FEAT_JOB_CHANNEL int b_write_to_channel; /* TRUE when appended lines are written to * a channel. */ #endif |