diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-05-17 12:58:30 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-05-17 12:58:30 +0000 |
commit | d46e6d1a55f1182b8aa2d621a2532bad3bc20ee9 (patch) | |
tree | cc859edcef407b063d8e7a2c76cf0fe74465cb5a | |
parent | a35958d4ad20dff88ac0db6f9d73a00fc2d89e14 (diff) | |
download | busybox-w32-d46e6d1a55f1182b8aa2d621a2532bad3bc20ee9.tar.gz busybox-w32-d46e6d1a55f1182b8aa2d621a2532bad3bc20ee9.tar.bz2 busybox-w32-d46e6d1a55f1182b8aa2d621a2532bad3bc20ee9.zip |
fix trivial compile errors found by randomconfig run
-rw-r--r-- | include/applets.h | 6 | ||||
-rw-r--r-- | libbb/Kbuild | 1 | ||||
-rw-r--r-- | networking/ip.c | 8 |
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)) | |||
176 | USE_INIT(APPLET(init, _BB_DIR_SBIN, _BB_SUID_NEVER)) | 176 | USE_INIT(APPLET(init, _BB_DIR_SBIN, _BB_SUID_NEVER)) |
177 | USE_INSMOD(APPLET(insmod, _BB_DIR_SBIN, _BB_SUID_NEVER)) | 177 | USE_INSMOD(APPLET(insmod, _BB_DIR_SBIN, _BB_SUID_NEVER)) |
178 | USE_INSTALL(APPLET(install, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) | 178 | USE_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 | ||
179 | USE_IP(APPLET(ip, _BB_DIR_BIN, _BB_SUID_NEVER)) | 184 | USE_IP(APPLET(ip, _BB_DIR_BIN, _BB_SUID_NEVER)) |
185 | #endif | ||
180 | USE_IPADDR(APPLET(ipaddr, _BB_DIR_BIN, _BB_SUID_NEVER)) | 186 | USE_IPADDR(APPLET(ipaddr, _BB_DIR_BIN, _BB_SUID_NEVER)) |
181 | USE_IPCALC(APPLET(ipcalc, _BB_DIR_BIN, _BB_SUID_NEVER)) | 187 | USE_IPCALC(APPLET(ipcalc, _BB_DIR_BIN, _BB_SUID_NEVER)) |
182 | USE_IPCRM(APPLET(ipcrm, _BB_DIR_USR_BIN, _BB_SUID_ALWAYS)) | 188 | USE_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 | |||
120 | lib-$(CONFIG_AWK) += xregcomp.o | 120 | lib-$(CONFIG_AWK) += xregcomp.o |
121 | lib-$(CONFIG_SED) += xregcomp.o | 121 | lib-$(CONFIG_SED) += xregcomp.o |
122 | lib-$(CONFIG_GREP) += xregcomp.o | 122 | lib-$(CONFIG_GREP) += xregcomp.o |
123 | lib-$(CONFIG_EXPR) += xregcomp.o | ||
123 | lib-$(CONFIG_MDEV) += xregcomp.o | 124 | lib-$(CONFIG_MDEV) += xregcomp.o |
124 | lib-$(CONFIG_LESS) += xregcomp.o | 125 | lib-$(CONFIG_LESS) += xregcomp.o |
125 | lib-$(CONFIG_DEVFSD) += xregcomp.o | 126 | lib-$(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 | |||
21 | static int ATTRIBUTE_NORETURN ip_print_help(int ATTRIBUTE_UNUSED ac, char ATTRIBUTE_UNUSED **av) | 27 | static 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 */ | ||