aboutsummaryrefslogtreecommitdiff
path: root/utility.c
diff options
context:
space:
mode:
authorerik <erik@69ca8d6d-28ef-0310-b511-8ec308f3f277>2000-03-07 07:58:57 +0000
committererik <erik@69ca8d6d-28ef-0310-b511-8ec308f3f277>2000-03-07 07:58:57 +0000
commitd1b124d0ed61572cce38d062bce2d9fbd9ff82d3 (patch)
tree2836566c6efad554fec2421e329486494f3bdbd0 /utility.c
parent7399902846d98d149e7d3216387c7ac832d5ce8e (diff)
downloadbusybox-w32-d1b124d0ed61572cce38d062bce2d9fbd9ff82d3.tar.gz
busybox-w32-d1b124d0ed61572cce38d062bce2d9fbd9ff82d3.tar.bz2
busybox-w32-d1b124d0ed61572cce38d062bce2d9fbd9ff82d3.zip
Fix up some #define stuff to ensure the Right Thing(tm)
happens with all combinations of BB_KILL and BB_KILLALL being defined. -Erik git-svn-id: svn://busybox.net/trunk/busybox@396 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'utility.c')
-rw-r--r--utility.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/utility.c b/utility.c
index 7de997474..789c6f228 100644
--- a/utility.c
+++ b/utility.c
@@ -1247,7 +1247,7 @@ extern int device_open(char *device, int mode)
1247#endif /* BB_INIT BB_SYSLOGD */ 1247#endif /* BB_INIT BB_SYSLOGD */
1248 1248
1249 1249
1250#if defined BB_INIT || defined BB_HALT || defined BB_REBOOT 1250#if defined BB_INIT || defined BB_HALT || defined BB_REBOOT || defined BB_KILLALL
1251 1251
1252#ifdef BB_FEATURE_USE_DEVPS_N_DEVMTAB 1252#ifdef BB_FEATURE_USE_DEVPS_N_DEVMTAB
1253#include <linux/devps.h> 1253#include <linux/devps.h>
@@ -1353,7 +1353,7 @@ extern pid_t findPidByName( char* pidName)
1353 return 0; 1353 return 0;
1354} 1354}
1355#endif /* BB_FEATURE_USE_DEVPS_N_DEVMTAB */ 1355#endif /* BB_FEATURE_USE_DEVPS_N_DEVMTAB */
1356#endif /* BB_INIT || BB_HALT || BB_REBOOT */ 1356#endif /* BB_INIT || BB_HALT || BB_REBOOT || KILLALL */
1357 1357
1358#if defined BB_GUNZIP \ 1358#if defined BB_GUNZIP \
1359 || defined BB_GZIP \ 1359 || defined BB_GZIP \