diff options
| author | bors <bors@rust-lang.org> | 2016-03-15 00:12:31 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-03-15 00:12:31 -0700 |
| commit | fa161aec169c05e48bd2ef0ec3a6ad294de0bb70 (patch) | |
| tree | 8018222969046a776b091733702175d2f30399c7 | |
| parent | aabff317d479e14ce51931cd1687df3b5adee18f (diff) | |
| parent | 10bfe0765147d62d730905115b02a6b32cea7266 (diff) | |
| download | rust-libc-fa161aec169c05e48bd2ef0ec3a6ad294de0bb70.tar.gz | |
Auto merge of #229 - kamalmarhubi:mount-flags, r=alexcrichton
linux: Move some MS_flags for mount(2) up
These flags are available on Android.
| -rw-r--r-- | src/unix/notbsd/linux/mod.rs | 5 | ||||
| -rw-r--r-- | src/unix/notbsd/mod.rs | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/unix/notbsd/linux/mod.rs b/src/unix/notbsd/linux/mod.rs index 82645ba0c3..ea0b462fa9 100644 --- a/src/unix/notbsd/linux/mod.rs +++ b/src/unix/notbsd/linux/mod.rs @@ -361,11 +361,6 @@ pub const SHM_UNLOCK: ::c_int = 12; pub const SHM_HUGETLB: ::c_int = 0o4000; pub const SHM_NORESERVE: ::c_int = 0o10000; -pub const MS_RELATIME: ::c_ulong = 0x200000; -pub const MS_KERNMOUNT: ::c_ulong = 0x400000; -pub const MS_I_VERSION: ::c_ulong = 0x800000; -pub const MS_STRICTATIME: ::c_ulong = 0x01000000; - pub const EPOLLRDHUP: ::c_int = 0x2000; pub const EPOLLONESHOT: ::c_int = 0x40000000; diff --git a/src/unix/notbsd/mod.rs b/src/unix/notbsd/mod.rs index d5958121a1..826e57536f 100644 --- a/src/unix/notbsd/mod.rs +++ b/src/unix/notbsd/mod.rs @@ -244,9 +244,12 @@ pub const MAP_FAILED: *mut ::c_void = !0 as *mut ::c_void; pub const MCL_CURRENT: ::c_int = 0x0001; pub const MCL_FUTURE: ::c_int = 0x0002; +// MS_ flags for msync(2) pub const MS_ASYNC: ::c_int = 0x0001; pub const MS_INVALIDATE: ::c_int = 0x0002; pub const MS_SYNC: ::c_int = 0x0004; + +// MS_ flags for mount(2) pub const MS_RDONLY: ::c_ulong = 0x01; pub const MS_NOSUID: ::c_ulong = 0x02; pub const MS_NODEV: ::c_ulong = 0x04; @@ -266,6 +269,10 @@ pub const MS_UNBINDABLE: ::c_ulong = 0x020000; pub const MS_PRIVATE: ::c_ulong = 0x040000; pub const MS_SLAVE: ::c_ulong = 0x080000; pub const MS_SHARED: ::c_ulong = 0x100000; +pub const MS_RELATIME: ::c_ulong = 0x200000; +pub const MS_KERNMOUNT: ::c_ulong = 0x400000; +pub const MS_I_VERSION: ::c_ulong = 0x800000; +pub const MS_STRICTATIME: ::c_ulong = 0x1000000; pub const MS_ACTIVE: ::c_ulong = 0x40000000; pub const MS_NOUSER: ::c_ulong = 0x80000000; pub const MS_MGC_VAL: ::c_ulong = 0xc0ed0000; |