From 102ff76c845746f9c0bae65299176a0a49f85260 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sat, 21 Nov 2009 17:14:08 +0100 Subject: [PATCH] mount: clean up #defines. No code changes Signed-off-by: Denys Vlasenko --- util-linux/mount.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/util-linux/mount.c b/util-linux/mount.c index 30037f9ab..271e691e7 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c @@ -19,6 +19,10 @@ #include #include #include +// Grab more as needed from util-linux's mount/mount_constants.h +#ifndef MS_DIRSYNC +# define MS_DIRSYNC (1 << 7) // Directory modifications are synchronous +#endif #ifndef MS_UNION # define MS_UNION (1 << 8) #endif @@ -34,7 +38,7 @@ #ifndef MS_SILENT # define MS_SILENT (1 << 15) #endif -/* The shared subtree stuff, which went in around 2.6.15. */ +// The shared subtree stuff, which went in around 2.6.15 #ifndef MS_UNBINDABLE # define MS_UNBINDABLE (1 << 17) #endif @@ -50,8 +54,8 @@ #ifndef MS_RELATIME # define MS_RELATIME (1 << 21) #endif -#include "libbb.h" +#include "libbb.h" #if ENABLE_FEATURE_MOUNT_LABEL # include "volume_id.h" #else @@ -66,14 +70,6 @@ #include #include -#ifndef MS_SILENT -#define MS_SILENT (1 << 15) -#endif -// Grab more as needed from util-linux's mount/mount_constants.h -#ifndef MS_DIRSYNC -#define MS_DIRSYNC 128 // Directory modifications are synchronous -#endif - #if defined(__dietlibc__) // 16.12.2006, Sampo Kellomaki (sampo@iki.fi)