patch 9.0.0978: build errors without the +channel feature

Problem:    Build errors without the +channel feature. (John Marriott)
Solution:   Adjust #ifdefs.

diff --git a/src/globals.h b/src/globals.h
index 0cc7c9bc47496fade9ba36de6e645e96c71c9aa3..8fb4340b163a54e4ca02207701a910aba005836c 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -1998,23 +1998,25 @@ EXTERN char *ch_part_names[]
 # endif
                ;
 
-EXTERN int did_repeated_msg INIT(= 0);
-# define REPEATED_MSG_LOOKING      1
-# define REPEATED_MSG_SAFESTATE            2
-
-// 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) \
+# define FOR_ALL_CHANNELS(ch) \
     for ((ch) = first_channel; (ch) != NULL; (ch) = (ch)->ch_next)
-#define FOR_ALL_JOBS(job) \
+# 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);
+
+EXTERN int did_repeated_msg INIT(= 0);
+# define REPEATED_MSG_LOOKING      1
+# define REPEATED_MSG_SAFESTATE            2
+#endif
+
 #if defined(FEAT_DIFF)
 #define FOR_ALL_DIFFBLOCKS_IN_TAB(tp, dp) \
     for ((dp) = (tp)->tp_first_diff; (dp) != NULL; (dp) = (dp)->df_next)

diff --git a/src/logfile.c b/src/logfile.c
index 3ab2c0f398f0d1132f54d0e96be20f4691b99b2c..6c159b078f7116b09cb31ea0c624df3726c90c9f 100644 (file)
--- 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;

diff --git a/src/message.c b/src/message.c
index a2fc008c2e63dde2960ec8854259a3868880aa3f..591691f3f656753adcec732ef591697133703378 100644 (file)
--- a/src/message.c
+++ b/src/message.c
@@ -37,7 +37,7 @@ static char_u *confirm_msg = NULL;            // ":confirm" message
 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
 

diff --git a/src/proto.h b/src/proto.h
index 4c7f8c9dade6b840d406615075def92f8e974851..9d1e1349d10972ff84536f744251c4ae27bfadd3 100644 (file)
--- 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)

diff --git a/src/typval.c b/src/typval.c
index a445bf8e9ab6b6338c95745e96269de007fe7e14..b1a0060467f2cf937f8a919e9c3fddf78a104f61 100644 (file)
--- a/src/typval.c
+++ b/src/typval.c
@@ -619,6 +619,16 @@ check_for_opt_job_arg(typval_T *args, int idx)
     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
 
 /*

diff --git a/src/version.c b/src/version.c
index 528b804c429c3607fecaa94d2125f95fd10afaad..537f6aa3557d3e8c04de03926ff8d3a25d72a008 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    978,
 /**/
     977,
 /**/