svn commit: trunk/busybox/libbb
vda at busybox.net
vda at busybox.net
Tue Apr 29 00:10:28 UTC 2008
Author: vda
Date: 2008-04-28 17:10:27 -0700 (Mon, 28 Apr 2008)
New Revision: 21885
Log:
fix build failure for libbusybox
Modified:
trunk/busybox/libbb/appletlib.c
Changeset:
Modified: trunk/busybox/libbb/appletlib.c
===================================================================
--- trunk/busybox/libbb/appletlib.c 2008-04-28 02:08:01 UTC (rev 21884)
+++ trunk/busybox/libbb/appletlib.c 2008-04-29 00:10:27 UTC (rev 21885)
@@ -216,7 +216,8 @@
#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 @@
exit(busybox_main(argv));
}
-#endif /* !ENABLE_FEATURE_INDIVIDUAL */
+#endif /* !defined(SINGLE_APPLET_MAIN) */
@@ -739,7 +740,7 @@
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));
More information about the busybox-cvs
mailing list