diff options
-rw-r--r-- | util-linux/mount.c | 16 |
1 files 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 @@ | |||
19 | #include <mntent.h> | 19 | #include <mntent.h> |
20 | #include <syslog.h> | 20 | #include <syslog.h> |
21 | #include <sys/mount.h> | 21 | #include <sys/mount.h> |
22 | // Grab more as needed from util-linux's mount/mount_constants.h | ||
23 | #ifndef MS_DIRSYNC | ||
24 | # define MS_DIRSYNC (1 << 7) // Directory modifications are synchronous | ||
25 | #endif | ||
22 | #ifndef MS_UNION | 26 | #ifndef MS_UNION |
23 | # define MS_UNION (1 << 8) | 27 | # define MS_UNION (1 << 8) |
24 | #endif | 28 | #endif |
@@ -34,7 +38,7 @@ | |||
34 | #ifndef MS_SILENT | 38 | #ifndef MS_SILENT |
35 | # define MS_SILENT (1 << 15) | 39 | # define MS_SILENT (1 << 15) |
36 | #endif | 40 | #endif |
37 | /* The shared subtree stuff, which went in around 2.6.15. */ | 41 | // The shared subtree stuff, which went in around 2.6.15 |
38 | #ifndef MS_UNBINDABLE | 42 | #ifndef MS_UNBINDABLE |
39 | # define MS_UNBINDABLE (1 << 17) | 43 | # define MS_UNBINDABLE (1 << 17) |
40 | #endif | 44 | #endif |
@@ -50,8 +54,8 @@ | |||
50 | #ifndef MS_RELATIME | 54 | #ifndef MS_RELATIME |
51 | # define MS_RELATIME (1 << 21) | 55 | # define MS_RELATIME (1 << 21) |
52 | #endif | 56 | #endif |
53 | #include "libbb.h" | ||
54 | 57 | ||
58 | #include "libbb.h" | ||
55 | #if ENABLE_FEATURE_MOUNT_LABEL | 59 | #if ENABLE_FEATURE_MOUNT_LABEL |
56 | # include "volume_id.h" | 60 | # include "volume_id.h" |
57 | #else | 61 | #else |
@@ -66,14 +70,6 @@ | |||
66 | #include <rpc/pmap_prot.h> | 70 | #include <rpc/pmap_prot.h> |
67 | #include <rpc/pmap_clnt.h> | 71 | #include <rpc/pmap_clnt.h> |
68 | 72 | ||
69 | #ifndef MS_SILENT | ||
70 | #define MS_SILENT (1 << 15) | ||
71 | #endif | ||
72 | // Grab more as needed from util-linux's mount/mount_constants.h | ||
73 | #ifndef MS_DIRSYNC | ||
74 | #define MS_DIRSYNC 128 // Directory modifications are synchronous | ||
75 | #endif | ||
76 | |||
77 | 73 | ||
78 | #if defined(__dietlibc__) | 74 | #if defined(__dietlibc__) |
79 | // 16.12.2006, Sampo Kellomaki (sampo@iki.fi) | 75 | // 16.12.2006, Sampo Kellomaki (sampo@iki.fi) |