Patch from Yann Morin to put BLKGETSIZE64 in platform.h had rather a lot of

fallout due to the #include <sys/mount.h>.  Removed that #include from various
applets and fixed up those that were unhappy when that #include was made
because they'd block copied stuff out of it.  (Sigh.)

1 files changed, 2 insertions, 6 deletions

diff --git a/util-linux/mount.c b/util-linux/mount.c
index e1c1c601b..9225289b6 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -13,7 +13,7 @@
  * bb_getopt_ulflags();
  */
 
-/* Design notes: There is no spec for this.  Remind me to write one.
+/* Design notes: There is no spec for mount.  Remind me to write one.
 
    mount_main() calls singlemount() which calls mount_it_now().
 
@@ -22,18 +22,14 @@
    mount_it_now() does the actual mount.
 */
 
-#include <limits.h>
-#include <stdlib.h>
+#include "busybox.h"
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <stdio.h>
 #include <mntent.h>
 #include <ctype.h>
-#include <sys/mount.h>
 #include <fcntl.h>              // for CONFIG_FEATURE_MOUNT_LOOP
 #include <sys/ioctl.h>  // for CONFIG_FEATURE_MOUNT_LOOP
-#include "busybox.h"
 
 // These two aren't always defined in old headers
 #ifndef MS_BIND