Mercurial > vim
changeset 31289:4f1e70a709bb v9.0.0978
patch 9.0.0978: build errors without the +channel feature
Commit: https://github.com/vim/vim/commit/3b8c7083b265c35861a7f96b01c079471ff45152
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Nov 30 20:20:56 2022 +0000
patch 9.0.0978: build errors without the +channel feature
Problem: Build errors without the +channel feature. (John Marriott)
Solution: Adjust #ifdefs.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 30 Nov 2022 21:30:03 +0100 |
| parents | 6195f37efb92 |
| children | 0a1b7fe2330a |
| files | src/globals.h src/logfile.c src/message.c src/proto.h src/typval.c src/version.c |
| diffstat | 6 files changed, 28 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/globals.h +++ b/src/globals.h @@ -1998,21 +1998,23 @@ EXTERN char *ch_part_names[] # endif ; -EXTERN int did_repeated_msg INIT(= 0); -# define REPEATED_MSG_LOOKING 1 -# define REPEATED_MSG_SAFESTATE 2 +// Whether a redraw is needed for appending a line to a buffer. +EXTERN int channel_need_redraw INIT(= FALSE); +# define FOR_ALL_CHANNELS(ch) \ + for ((ch) = first_channel; (ch) != NULL; (ch) = (ch)->ch_next) +# define FOR_ALL_JOBS(job) \ + for ((job) = first_job; (job) != NULL; (job) = (job)->jv_next) +#endif + +#ifdef FEAT_EVAL // This flag is set when outputting a terminal control code and reset in // out_flush() when characters have been written. EXTERN int ch_log_output INIT(= FALSE); -// Whether a redraw is needed for appending a line to a buffer. -EXTERN int channel_need_redraw INIT(= FALSE); - -#define FOR_ALL_CHANNELS(ch) \ - for ((ch) = first_channel; (ch) != NULL; (ch) = (ch)->ch_next) -#define FOR_ALL_JOBS(job) \ - for ((job) = first_job; (job) != NULL; (job) = (job)->jv_next) +EXTERN int did_repeated_msg INIT(= 0); +# define REPEATED_MSG_LOOKING 1 +# define REPEATED_MSG_SAFESTATE 2 #endif #if defined(FEAT_DIFF)
--- a/src/logfile.c +++ b/src/logfile.c @@ -75,7 +75,7 @@ ch_log_active(void) } static void -ch_log_lead(const char *what, channel_T *ch, ch_part_T part) +ch_log_lead(const char *what, channel_T *ch UNUSED, ch_part_T part UNUSED) { if (log_fd == NULL) return;
--- a/src/message.c +++ b/src/message.c @@ -37,7 +37,7 @@ static char_u *confirm_msg = NULL; // " static char_u *confirm_msg_tail; // tail of confirm_msg static void display_confirm_msg(void); #endif -#ifdef FEAT_JOB_CHANNEL +#ifdef FEAT_EVAL static int emsg_to_channel_log = FALSE; #endif
--- a/src/proto.h +++ b/src/proto.h @@ -263,11 +263,12 @@ void mbyte_im_set_active(int active_arg) # ifdef FEAT_JOB_CHANNEL # include "job.pro" # include "channel.pro" +# endif +# ifdef FEAT_EVAL // Not generated automatically so that we can add an extra attribute. void ch_log(channel_T *ch, const char *fmt, ...) ATTRIBUTE_FORMAT_PRINTF(2, 3); void ch_error(channel_T *ch, const char *fmt, ...) ATTRIBUTE_FORMAT_PRINTF(2, 3); - # endif # if defined(FEAT_GUI) || defined(FEAT_JOB_CHANNEL)
--- a/src/typval.c +++ b/src/typval.c @@ -619,6 +619,16 @@ check_for_opt_job_arg(typval_T *args, in return (args[idx].v_type == VAR_UNKNOWN || check_for_job_arg(args, idx) != FAIL) ? OK : FAIL; } +#else +/* + * Give an error and return FAIL unless "args[idx]" is an optional channel or a + * job. Used without the +channel feature, thus only VAR_UNKNOWN is accepted. + */ + int +check_for_opt_chan_or_job_arg(typval_T *args, int idx) +{ + return args[idx].v_type == VAR_UNKNOWN ? OK : FAIL; +} #endif /*