diff options
author | erik <erik@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2000-03-08 14:50:47 +0000 |
---|---|---|
committer | erik <erik@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2000-03-08 14:50:47 +0000 |
commit | 55ffdbb2e8d0db01a1f99cbb71af91a48260262d (patch) | |
tree | fc86ee9610aecb7aeebac03116d15a6b4ef51a9a /utility.c | |
parent | 92e93fffd2823af7fbeed286a876545e83caf009 (diff) | |
download | busybox-w32-55ffdbb2e8d0db01a1f99cbb71af91a48260262d.tar.gz busybox-w32-55ffdbb2e8d0db01a1f99cbb71af91a48260262d.tar.bz2 busybox-w32-55ffdbb2e8d0db01a1f99cbb71af91a48260262d.zip |
Change BB_FEATURE_USE_DEVPS_N_DEVMTAB to the simpler
BB_FEATURE_USE_DEVPS_PATCH.
-Erik
git-svn-id: svn://busybox.net/trunk/busybox@401 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to '')
-rw-r--r-- | utility.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -58,7 +58,7 @@ | |||
58 | 58 | ||
59 | /* Busybox mount uses either /proc/filesystems or /dev/mtab to get the | 59 | /* Busybox mount uses either /proc/filesystems or /dev/mtab to get the |
60 | * list of available filesystems used for the -t auto option */ | 60 | * list of available filesystems used for the -t auto option */ |
61 | #if defined BB_FEATURE_USE_PROCFS && defined BB_FEATURE_USE_DEVPS_N_DEVMTAB | 61 | #if defined BB_FEATURE_USE_PROCFS && defined BB_FEATURE_USE_DEVPS_PATCH |
62 | //#error Sorry, but busybox can't use both /proc and /dev/ps at the same time -- Pick one and try again. | 62 | //#error Sorry, but busybox can't use both /proc and /dev/ps at the same time -- Pick one and try again. |
63 | #error "Sorry, but busybox can't use both /proc and /dev/ps at the same time -- Pick one and try again." | 63 | #error "Sorry, but busybox can't use both /proc and /dev/ps at the same time -- Pick one and try again." |
64 | #endif | 64 | #endif |
@@ -71,10 +71,10 @@ const char mtab_file[] = "/proc/mounts"; | |||
71 | # if defined BB_MTAB | 71 | # if defined BB_MTAB |
72 | const char mtab_file[] = "/etc/mtab"; | 72 | const char mtab_file[] = "/etc/mtab"; |
73 | # else | 73 | # else |
74 | # if defined BB_FEATURE_USE_DEVPS_N_DEVMTAB | 74 | # if defined BB_FEATURE_USE_DEVPS_PATCH |
75 | const char mtab_file[] = "/dev/mtab"; | 75 | const char mtab_file[] = "/dev/mtab"; |
76 | # else | 76 | # else |
77 | # error With (BB_MOUNT||BB_UMOUNT||BB_DF) defined, you must define either BB_MTAB or ( BB_FEATURE_USE_PROCFS | BB_FEATURE_USE_DEVPS_N_DEVMTAB) | 77 | # error With (BB_MOUNT||BB_UMOUNT||BB_DF) defined, you must define either BB_MTAB or ( BB_FEATURE_USE_PROCFS | BB_FEATURE_USE_DEVPS_PATCH) |
78 | # endif | 78 | # endif |
79 | # endif | 79 | # endif |
80 | # endif | 80 | # endif |
@@ -1249,11 +1249,11 @@ extern int device_open(char *device, int mode) | |||
1249 | 1249 | ||
1250 | #if defined BB_KILLALL || defined BB_FEATURE_LINUXRC && ( defined BB_HALT || defined BB_REBOOT || defined BB_POWEROFF ) | 1250 | #if defined BB_KILLALL || defined BB_FEATURE_LINUXRC && ( defined BB_HALT || defined BB_REBOOT || defined BB_POWEROFF ) |
1251 | 1251 | ||
1252 | #ifdef BB_FEATURE_USE_DEVPS_N_DEVMTAB | 1252 | #ifdef BB_FEATURE_USE_DEVPS_PATCH |
1253 | #include <linux/devps.h> | 1253 | #include <linux/devps.h> |
1254 | #endif | 1254 | #endif |
1255 | 1255 | ||
1256 | #if defined BB_FEATURE_USE_DEVPS_N_DEVMTAB | 1256 | #if defined BB_FEATURE_USE_DEVPS_PATCH |
1257 | /* findPidByName() | 1257 | /* findPidByName() |
1258 | * | 1258 | * |
1259 | * This finds the pid of the specified process, | 1259 | * This finds the pid of the specified process, |
@@ -1314,7 +1314,7 @@ extern pid_t findPidByName( char* pidName) | |||
1314 | 1314 | ||
1315 | return thePid; | 1315 | return thePid; |
1316 | } | 1316 | } |
1317 | #else /* BB_FEATURE_USE_DEVPS_N_DEVMTAB */ | 1317 | #else /* BB_FEATURE_USE_DEVPS_PATCH */ |
1318 | #if ! defined BB_FEATURE_USE_PROCFS | 1318 | #if ! defined BB_FEATURE_USE_PROCFS |
1319 | #error Sorry, I depend on the /proc filesystem right now. | 1319 | #error Sorry, I depend on the /proc filesystem right now. |
1320 | #endif | 1320 | #endif |
@@ -1362,7 +1362,7 @@ extern pid_t findPidByName( char* pidName) | |||
1362 | } | 1362 | } |
1363 | return 0; | 1363 | return 0; |
1364 | } | 1364 | } |
1365 | #endif /* BB_FEATURE_USE_DEVPS_N_DEVMTAB */ | 1365 | #endif /* BB_FEATURE_USE_DEVPS_PATCH */ |
1366 | #endif /* BB_INIT || BB_HALT || BB_REBOOT || BB_KILLALL || BB_POWEROFF */ | 1366 | #endif /* BB_INIT || BB_HALT || BB_REBOOT || BB_KILLALL || BB_POWEROFF */ |
1367 | 1367 | ||
1368 | #if defined BB_GUNZIP \ | 1368 | #if defined BB_GUNZIP \ |