--- trunk/mkinitrd-magellan/busybox/debianutils/start_stop_daemon.c	2010/04/29 20:38:48	983
+++ trunk/mkinitrd-magellan/busybox/debianutils/start_stop_daemon.c	2010/05/30 11:32:42	984
@@ -347,13 +347,13 @@
 	/* -xa (at least one) is required if -S is given */
 	/* -q turns off -v */
 	opt_complementary = "K:S:K--S:S--K:m?p:K?xpun:S?xa"
-		USE_FEATURE_START_STOP_DAEMON_FANCY("q-v");
+		IF_FEATURE_START_STOP_DAEMON_FANCY("q-v");
 	opt = getopt32(argv, "KSbqtma:n:s:u:c:x:p:"
-		USE_FEATURE_START_STOP_DAEMON_FANCY("ovN:R:"),
+		IF_FEATURE_START_STOP_DAEMON_FANCY("ovN:R:"),
 		&startas, &cmdname, &signame, &userspec, &chuid, &execname, &pidfile
-		USE_FEATURE_START_STOP_DAEMON_FANCY(,&opt_N)
+		IF_FEATURE_START_STOP_DAEMON_FANCY(,&opt_N)
 		/* We accept and ignore -R <param> / --retry <param> */
-		USE_FEATURE_START_STOP_DAEMON_FANCY(,NULL)
+		IF_FEATURE_START_STOP_DAEMON_FANCY(,NULL)
 	);
 
 	if (opt & OPT_s) {
@@ -366,7 +366,7 @@
 	if (!execname) /* in case -a is given and -x is not */
 		execname = startas;
 
-//	USE_FEATURE_START_STOP_DAEMON_FANCY(
+//	IF_FEATURE_START_STOP_DAEMON_FANCY(
 //		if (retry_arg)
 //			retries = xatoi_u(retry_arg);
 //	)
@@ -443,5 +443,5 @@
 	}
 #endif
 	execvp(startas, argv);
-	bb_perror_msg_and_die("cannot start %s", startas);
+	bb_perror_msg_and_die("can't start %s", startas);
 }