Fix up some #define stuff to ensure the Right Thing(tm)

happens with all combinations of BB_KILL and BB_KILLALL
being defined.
 -Erik
This commit is contained in:
Erik Andersen 2000-03-07 07:58:57 +00:00
parent 06249f24f3
commit cbd0d625c7
2 changed files with 5 additions and 2 deletions

View File

@ -39,7 +39,9 @@
// Don't turn BB_INSMOD on. It doesn't work. // Don't turn BB_INSMOD on. It doesn't work.
//#define BB_INSMOD //#define BB_INSMOD
#define BB_KILL #define BB_KILL
#ifdef BB_KILL
#define BB_KILLALL #define BB_KILLALL
#endif
#define BB_KLOGD #define BB_KLOGD
//#define BB_LENGTH //#define BB_LENGTH
#define BB_LN #define BB_LN
@ -176,3 +178,4 @@
// //
//Make sure nothing is printed to the console on boot //Make sure nothing is printed to the console on boot
#define BB_FEATURE_EXTRA_QUIET #define BB_FEATURE_EXTRA_QUIET

View File

@ -1247,7 +1247,7 @@ extern int device_open(char *device, int mode)
#endif /* BB_INIT BB_SYSLOGD */ #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 #ifdef BB_FEATURE_USE_DEVPS_N_DEVMTAB
#include <linux/devps.h> #include <linux/devps.h>
@ -1353,7 +1353,7 @@ extern pid_t findPidByName( char* pidName)
return 0; return 0;
} }
#endif /* BB_FEATURE_USE_DEVPS_N_DEVMTAB */ #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 \ #if defined BB_GUNZIP \
|| defined BB_GZIP \ || defined BB_GZIP \