aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-04-29 00:10:27 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-04-29 00:10:27 +0000
commit10f6fb1d4662bc7f460d73a210399d67402ab857 (patch)
treebad8c302350bf12cc14ce44a1e0490539e63532f
parente4ed64067e7de0607cfb23b95a542e29a84bf1fa (diff)
downloadbusybox-10f6fb1d4662bc7f460d73a210399d67402ab857.tar.gz
busybox-10f6fb1d4662bc7f460d73a210399d67402ab857.tar.bz2
fix build failure for libbusybox
-rw-r--r--libbb/appletlib.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 5f6923da4..9fe0cf963 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -216,7 +216,8 @@ bool re_execed;
#endif
-#if !ENABLE_FEATURE_INDIVIDUAL
+/* If not built as a single-applet executable... */
+#if !defined(SINGLE_APPLET_MAIN)
USE_FEATURE_SUID(static uid_t ruid;) /* real uid */
@@ -729,7 +730,7 @@ void run_applet_and_exit(const char *name, char **argv)
exit(busybox_main(argv));
}
-#endif /* !ENABLE_FEATURE_INDIVIDUAL */
+#endif /* !defined(SINGLE_APPLET_MAIN) */
@@ -739,7 +740,7 @@ int lbb_main(char **argv)
int main(int argc ATTRIBUTE_UNUSED, char **argv)
#endif
{
-#if ENABLE_FEATURE_INDIVIDUAL
+#if defined(SINGLE_APPLET_MAIN)
/* Only one applet is selected by the user! */
/* applet_names in this case is just "applet\0\0" */
lbb_prepare(applet_names USE_FEATURE_INDIVIDUAL(, argv));