[git commit master] build failure fix and some cosmetics

Denys Vlasenko vda.linux at googlemail.com
Thu Oct 22 23:30:26 UTC 2009


commit: http://git.busybox.net/busybox/commit/?id=c1947f18f539b3e2e1972ec0c9a78c4651cf328b
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 libbb/appletlib.c |    2 +-
 shell/hush.c      |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 0ebea4f..b31532a 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -27,10 +27,10 @@
  * FEATURE_INSTALLER or FEATURE_SUID will still link printf routines in. :(
  */
 
+#include "busybox.h"
 #include <assert.h>
 #include <malloc.h>
 #include <sys/user.h> /* PAGE_SIZE */
-#include "busybox.h"
 
 
 /* Declare <applet>_main() */
diff --git a/shell/hush.c b/shell/hush.c
index 5edcdb8..1187cbe 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -454,9 +454,9 @@ struct function {
 	char *name;
 	struct command *parent_cmd;
 	struct pipe *body;
-#if !BB_MMU
+# if !BB_MMU
 	char *body_as_string;
-#endif
+# endif
 };
 #endif
 
-- 
1.6.3.3



More information about the busybox-cvs mailing list