diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-07-22 18:48:38 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-07-22 18:48:38 +0200 |
| commit | 0fb0045aa9261be1dda49dfdfb95cbc585402a8b (patch) | |
| tree | 951e3f34078b2a2e5702672472dc7ba3b1e51926 /include | |
| parent | 49117b48008e0fe36d6680c787045cb44a300f93 (diff) | |
| download | busybox-w32-0fb0045aa9261be1dda49dfdfb95cbc585402a8b.tar.gz busybox-w32-0fb0045aa9261be1dda49dfdfb95cbc585402a8b.tar.bz2 busybox-w32-0fb0045aa9261be1dda49dfdfb95cbc585402a8b.zip | |
config: disentangle PREFER_APPLETS from SH_STANDALONE and SH_NOFORK
On user request.
I thought enabling/disabling them all together is more consistent.
Evidently, some people do want them to be separately selectable.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/busybox.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/busybox.h b/include/busybox.h index 737627bd0..6a003d544 100644 --- a/include/busybox.h +++ b/include/busybox.h | |||
| @@ -19,7 +19,9 @@ extern const uint8_t applet_flags[] ALIGN1; | |||
| 19 | extern const uint8_t applet_suid[] ALIGN1; | 19 | extern const uint8_t applet_suid[] ALIGN1; |
| 20 | extern const uint8_t applet_install_loc[] ALIGN1; | 20 | extern const uint8_t applet_install_loc[] ALIGN1; |
| 21 | 21 | ||
| 22 | #if ENABLE_FEATURE_PREFER_APPLETS | 22 | #if ENABLE_FEATURE_PREFER_APPLETS \ |
| 23 | || ENABLE_FEATURE_SH_STANDALONE \ | ||
| 24 | || ENABLE_FEATURE_SH_NOFORK | ||
| 23 | # define APPLET_IS_NOFORK(i) (applet_flags[(i)/4] & (1 << (2 * ((i)%4)))) | 25 | # define APPLET_IS_NOFORK(i) (applet_flags[(i)/4] & (1 << (2 * ((i)%4)))) |
| 24 | # define APPLET_IS_NOEXEC(i) (applet_flags[(i)/4] & (1 << ((2 * ((i)%4))+1))) | 26 | # define APPLET_IS_NOEXEC(i) (applet_flags[(i)/4] & (1 << ((2 * ((i)%4))+1))) |
| 25 | #else | 27 | #else |