diff options
| author | Erik Andersen | 2000-03-07 07:58:57 +0000 |
|---|---|---|
| committer | Erik Andersen | 2000-03-07 07:58:57 +0000 |
| commit | cbd0d625c7466af80f141e0ae24186e15987bf3e (patch) | |
| tree | 2836566c6efad554fec2421e329486494f3bdbd0 | |
| parent | 06249f24f3d49da1fbd60b74672955849cf9d6a0 (diff) | |
| download | busybox-cbd0d625c7466af80f141e0ae24186e15987bf3e.zip busybox-cbd0d625c7466af80f141e0ae24186e15987bf3e.tar.gz | |
Fix up some #define stuff to ensure the Right Thing(tm)
happens with all combinations of BB_KILL and BB_KILLALL
being defined.
-Erik
| -rw-r--r-- | busybox.def.h | 3 | ||||
| -rw-r--r-- | utility.c | 4 |
2 files changed, 5 insertions, 2 deletions
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 + @@ -1247,7 +1247,7 @@ extern int device_open(char *device, int mode) #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 @@ extern pid_t findPidByName( char* pidName) 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 \ |