randomconfig fixes
authorDenys Vlasenko <vda.linux@googlemail.com>
Tue, 23 Jun 2020 00:46:53 +0000 (02:46 +0200)
committerDenys Vlasenko <vda.linux@googlemail.com>
Tue, 23 Jun 2020 00:46:53 +0000 (02:46 +0200)
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
include/libbb.h
networking/brctl.c

index 392c0443d324e271bf561c02424f9489d92e1160..d9858f5dfe34ec786f0adec54c1ac6f8cc6f6f03 100644 (file)
@@ -1385,8 +1385,10 @@ static inline void __attribute__ ((deprecated("use bb_simple_info_msg instead"))
 #define bb_perror_msg_and_die(...) BB_MSG(_perror_msg_and_die, BB_MSG_KIND(__VA_ARGS__), __VA_ARGS__)
 #define bb_herror_msg(...)         BB_MSG(_herror_msg, BB_MSG_KIND(__VA_ARGS__), __VA_ARGS__)
 #define bb_herror_msg_and_die(...) BB_MSG(_herror_msg_and_die, BB_MSG_KIND(__VA_ARGS__), __VA_ARGS__)
+#if ENABLE_FEATURE_SYSLOG_INFO
 #define bb_info_msg(...)           BB_MSG(_info_msg, BB_MSG_KIND(__VA_ARGS__), __VA_ARGS__)
 #endif
+#endif
 
 /* We need to export XXX_main from libbusybox
  * only if we build "individual" binaries
index 25640246d13b6a19d3b571c24f6689006f9c0dc7..68725f93ca811db71a5e5c66c6aaf096a11e2b51 100644 (file)
@@ -591,6 +591,7 @@ int brctl_main(int argc UNUSED_PARAM, char **argv)
                return EXIT_SUCCESS;
        }
 
+#if ENABLE_FEATURE_BRCTL_FANCY
        if (key == ARG_showmacs) {
                show_bridge_macs(br);
                return EXIT_SUCCESS;
@@ -599,6 +600,7 @@ int brctl_main(int argc UNUSED_PARAM, char **argv)
                show_bridge_stp(br);
                return EXIT_SUCCESS;
        }
+#endif
 
        if (!*argv) /* All of the below need at least two arguments */
                bb_show_usage();