aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-05-17 12:58:30 +0000
committervda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-05-17 12:58:30 +0000
commit3a4a981f0bd38309b3bf621906f8cbe9827c0b2a (patch)
treecc859edcef407b063d8e7a2c76cf0fe74465cb5a
parent2c9618bf8e7e7b1d1572e48c2ce92ca53a4c3da3 (diff)
downloadbusybox-w32-3a4a981f0bd38309b3bf621906f8cbe9827c0b2a.tar.gz
busybox-w32-3a4a981f0bd38309b3bf621906f8cbe9827c0b2a.tar.bz2
busybox-w32-3a4a981f0bd38309b3bf621906f8cbe9827c0b2a.zip
fix trivial compile errors found by randomconfig run
git-svn-id: svn://busybox.net/trunk/busybox@18639 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--include/applets.h6
-rw-r--r--libbb/Kbuild1
-rw-r--r--networking/ip.c8
3 files changed, 15 insertions, 0 deletions
diff --git a/include/applets.h b/include/applets.h
index a7aee3a1d..99e6aceb5 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -176,7 +176,13 @@ USE_INETD(APPLET(inetd, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
176USE_INIT(APPLET(init, _BB_DIR_SBIN, _BB_SUID_NEVER)) 176USE_INIT(APPLET(init, _BB_DIR_SBIN, _BB_SUID_NEVER))
177USE_INSMOD(APPLET(insmod, _BB_DIR_SBIN, _BB_SUID_NEVER)) 177USE_INSMOD(APPLET(insmod, _BB_DIR_SBIN, _BB_SUID_NEVER))
178USE_INSTALL(APPLET(install, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) 178USE_INSTALL(APPLET(install, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
179#if ENABLE_FEATURE_IP_ADDRESS \
180 || ENABLE_FEATURE_IP_ROUTE \
181 || ENABLE_FEATURE_IP_LINK \
182 || ENABLE_FEATURE_IP_TUNNEL \
183 || ENABLE_FEATURE_IP_RULE
179USE_IP(APPLET(ip, _BB_DIR_BIN, _BB_SUID_NEVER)) 184USE_IP(APPLET(ip, _BB_DIR_BIN, _BB_SUID_NEVER))
185#endif
180USE_IPADDR(APPLET(ipaddr, _BB_DIR_BIN, _BB_SUID_NEVER)) 186USE_IPADDR(APPLET(ipaddr, _BB_DIR_BIN, _BB_SUID_NEVER))
181USE_IPCALC(APPLET(ipcalc, _BB_DIR_BIN, _BB_SUID_NEVER)) 187USE_IPCALC(APPLET(ipcalc, _BB_DIR_BIN, _BB_SUID_NEVER))
182USE_IPCRM(APPLET(ipcrm, _BB_DIR_USR_BIN, _BB_SUID_ALWAYS)) 188USE_IPCRM(APPLET(ipcrm, _BB_DIR_USR_BIN, _BB_SUID_ALWAYS))
diff --git a/libbb/Kbuild b/libbb/Kbuild
index 5cc8d1428..e562f3222 100644
--- a/libbb/Kbuild
+++ b/libbb/Kbuild
@@ -120,6 +120,7 @@ lib-$(CONFIG_SELINUX) += selinux_common.o
120lib-$(CONFIG_AWK) += xregcomp.o 120lib-$(CONFIG_AWK) += xregcomp.o
121lib-$(CONFIG_SED) += xregcomp.o 121lib-$(CONFIG_SED) += xregcomp.o
122lib-$(CONFIG_GREP) += xregcomp.o 122lib-$(CONFIG_GREP) += xregcomp.o
123lib-$(CONFIG_EXPR) += xregcomp.o
123lib-$(CONFIG_MDEV) += xregcomp.o 124lib-$(CONFIG_MDEV) += xregcomp.o
124lib-$(CONFIG_LESS) += xregcomp.o 125lib-$(CONFIG_LESS) += xregcomp.o
125lib-$(CONFIG_DEVFSD) += xregcomp.o 126lib-$(CONFIG_DEVFSD) += xregcomp.o
diff --git a/networking/ip.c b/networking/ip.c
index dd1d863da..c7816c8cc 100644
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -18,6 +18,12 @@
18#include "libiproute/utils.h" 18#include "libiproute/utils.h"
19#include "libiproute/ip_common.h" 19#include "libiproute/ip_common.h"
20 20
21#if ENABLE_FEATURE_IP_ADDRESS \
22 || ENABLE_FEATURE_IP_ROUTE \
23 || ENABLE_FEATURE_IP_LINK \
24 || ENABLE_FEATURE_IP_TUNNEL \
25 || ENABLE_FEATURE_IP_RULE
26
21static int ATTRIBUTE_NORETURN ip_print_help(int ATTRIBUTE_UNUSED ac, char ATTRIBUTE_UNUSED **av) 27static int ATTRIBUTE_NORETURN ip_print_help(int ATTRIBUTE_UNUSED ac, char ATTRIBUTE_UNUSED **av)
22{ 28{
23 bb_show_usage(); 29 bb_show_usage();
@@ -121,3 +127,5 @@ int ip_main(int argc, char **argv)
121 } 127 }
122 return (ip_func(argc, argv)); 128 return (ip_func(argc, argv));
123} 129}
130
131#endif /* any of ENABLE_FEATURE_IP_xxx is 1 */