Moved some #ifdefs down below #include "busybox.h" where they belong.

diff --git a/lash.c b/lash.c
index 892237b085d9de999e73e148bf9c39435b0b02f5..1d128355cafd1cfd63e250d106ffec683ad22057 100644 (file)
--- a/lash.c
+++ b/lash.c
@@ -64,6 +64,8 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include <getopt.h>
+#include "busybox.h"
+#include "cmdedit.h"
 
 #ifdef BB_LOCALE_SUPPORT
 #include <locale.h>
@@ -79,8 +81,6 @@
 #include <glob.h>
 #define expand_t       glob_t
 #endif 
-#include "busybox.h"
-#include "cmdedit.h"
 
 
 static const int MAX_READ = 128;       /* size of input buffer for `read' builtin */

diff --git a/mount.c b/mount.c
index 90c1cc723beec79ceae2f6565e32bed99b0cc808..fa298d93a28841d1cbff650afb7daf9e31100fae 100644 (file)
--- a/mount.c
+++ b/mount.c
@@ -50,10 +50,10 @@
 #include <stdio.h>
 #include <mntent.h>
 #include <ctype.h>
+#include "busybox.h"
 #if defined BB_FEATURE_USE_DEVPS_PATCH
-#include <linux/devmtab.h> /* For Erik's nifty devmtab device driver */
+#      include <linux/devmtab.h> /* For Erik's nifty devmtab device driver */
 #endif
-#include "busybox.h"
 
 enum {
        MS_MGC_VAL = 0xc0ed0000, /* Magic number indicatng "new" flags */

diff --git a/sh.c b/sh.c
index 892237b085d9de999e73e148bf9c39435b0b02f5..1d128355cafd1cfd63e250d106ffec683ad22057 100644 (file)
--- a/sh.c
+++ b/sh.c
@@ -64,6 +64,8 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include <getopt.h>
+#include "busybox.h"
+#include "cmdedit.h"
 
 #ifdef BB_LOCALE_SUPPORT
 #include <locale.h>
@@ -79,8 +81,6 @@
 #include <glob.h>
 #define expand_t       glob_t
 #endif 
-#include "busybox.h"
-#include "cmdedit.h"
 
 
 static const int MAX_READ = 128;       /* size of input buffer for `read' builtin */

diff --git a/shell/lash.c b/shell/lash.c
index 892237b085d9de999e73e148bf9c39435b0b02f5..1d128355cafd1cfd63e250d106ffec683ad22057 100644 (file)
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -64,6 +64,8 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include <getopt.h>
+#include "busybox.h"
+#include "cmdedit.h"
 
 #ifdef BB_LOCALE_SUPPORT
 #include <locale.h>
@@ -79,8 +81,6 @@
 #include <glob.h>
 #define expand_t       glob_t
 #endif 
-#include "busybox.h"
-#include "cmdedit.h"
 
 
 static const int MAX_READ = 128;       /* size of input buffer for `read' builtin */

diff --git a/util-linux/mount.c b/util-linux/mount.c
index 90c1cc723beec79ceae2f6565e32bed99b0cc808..fa298d93a28841d1cbff650afb7daf9e31100fae 100644 (file)
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -50,10 +50,10 @@
 #include <stdio.h>
 #include <mntent.h>
 #include <ctype.h>
+#include "busybox.h"
 #if defined BB_FEATURE_USE_DEVPS_PATCH
-#include <linux/devmtab.h> /* For Erik's nifty devmtab device driver */
+#      include <linux/devmtab.h> /* For Erik's nifty devmtab device driver */
 #endif
-#include "busybox.h"
 
 enum {
        MS_MGC_VAL = 0xc0ed0000, /* Magic number indicatng "new" flags */