aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2020-06-23 02:46:53 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2020-06-23 02:46:53 +0200
commit6eb38fded2f459f2828121a2f6b1499da2677553 (patch)
tree3762da91bad8762ff3666d4936460b6dc914a15e
parent62744efa472886ea8fdeb262dcb184974e3f88de (diff)
downloadbusybox-6eb38fded2f459f2828121a2f6b1499da2677553.tar.gz
randomconfig fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--include/libbb.h2
-rw-r--r--networking/brctl.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/include/libbb.h b/include/libbb.h
index 392c0443d..d9858f5df 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -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
diff --git a/networking/brctl.c b/networking/brctl.c
index 25640246d..68725f93c 100644
--- a/networking/brctl.c
+++ b/networking/brctl.c
@@ -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();