Fix up some #define stuff to ensure the Right Thing(tm)
happens with all combinations of BB_KILL and BB_KILLALL
being defined.
-Erik
diff --git a/busybox.def.h b/busybox.def.h
index 75ad04d..afdc469 100644
--- a/busybox.def.h
+++ b/busybox.def.h
@@ -39,7 +39,9 @@
// Don't turn BB_INSMOD on. It doesn't work.
//#define BB_INSMOD
#define BB_KILL
+#ifdef BB_KILL
#define BB_KILLALL
+#endif
#define BB_KLOGD
//#define BB_LENGTH
#define BB_LN
@@ -176,3 +178,4 @@
//
//Make sure nothing is printed to the console on boot
#define BB_FEATURE_EXTRA_QUIET
+
diff --git a/utility.c b/utility.c
index 7de9974..789c6f2 100644
--- a/utility.c
+++ b/utility.c
@@ -1247,7 +1247,7 @@
#endif /* BB_INIT BB_SYSLOGD */
-#if defined BB_INIT || defined BB_HALT || defined BB_REBOOT
+#if defined BB_INIT || defined BB_HALT || defined BB_REBOOT || defined BB_KILLALL
#ifdef BB_FEATURE_USE_DEVPS_N_DEVMTAB
#include <linux/devps.h>
@@ -1353,7 +1353,7 @@
return 0;
}
#endif /* BB_FEATURE_USE_DEVPS_N_DEVMTAB */
-#endif /* BB_INIT || BB_HALT || BB_REBOOT */
+#endif /* BB_INIT || BB_HALT || BB_REBOOT || KILLALL */
#if defined BB_GUNZIP \
|| defined BB_GZIP \