diff options
| author | bors <bors@rust-lang.org> | 2016-03-13 13:39:33 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-03-13 13:39:33 -0700 |
| commit | 722fedd5bb2e1d337fe88bcab59e5872e8ea92cd (patch) | |
| tree | aa3042a6be458144042f486d71250da919127187 | |
| parent | d9f256ec37d5e0750f2394482ae4921cd596fc93 (diff) | |
| parent | ae69a167acc6685dcf4634a810bcf0c235984c78 (diff) | |
| download | rust-libc-722fedd5bb2e1d337fe88bcab59e5872e8ea92cd.tar.gz | |
Auto merge of #227 - kamalmarhubi:clone-flags, r=alexcrichton
linux: Move namespace clone flags up one level
The flags are available in Android, and should be defined higher up.
| -rw-r--r-- | src/unix/notbsd/linux/mod.rs | 7 | ||||
| -rw-r--r-- | src/unix/notbsd/mod.rs | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/unix/notbsd/linux/mod.rs b/src/unix/notbsd/linux/mod.rs index 6d01a25f40..82645ba0c3 100644 --- a/src/unix/notbsd/linux/mod.rs +++ b/src/unix/notbsd/linux/mod.rs @@ -378,13 +378,6 @@ pub const EFD_SEMAPHORE: ::c_int = 0x1; pub const NCCS: usize = 32; -pub const CLONE_NEWUTS: ::c_int = 0x04000000; -pub const CLONE_NEWIPC: ::c_int = 0x08000000; -pub const CLONE_NEWUSER: ::c_int = 0x10000000; -pub const CLONE_NEWPID: ::c_int = 0x20000000; -pub const CLONE_NEWNET: ::c_int = 0x40000000; -pub const CLONE_IO: ::c_int = 0x80000000; - pub const AF_NETLINK: ::c_int = 16; f! { diff --git a/src/unix/notbsd/mod.rs b/src/unix/notbsd/mod.rs index c6d1347c77..d5958121a1 100644 --- a/src/unix/notbsd/mod.rs +++ b/src/unix/notbsd/mod.rs @@ -539,6 +539,12 @@ pub const CLONE_CHILD_CLEARTID: ::c_int = 0x200000; pub const CLONE_DETACHED: ::c_int = 0x400000; pub const CLONE_UNTRACED: ::c_int = 0x800000; pub const CLONE_CHILD_SETTID: ::c_int = 0x01000000; +pub const CLONE_NEWUTS: ::c_int = 0x04000000; +pub const CLONE_NEWIPC: ::c_int = 0x08000000; +pub const CLONE_NEWUSER: ::c_int = 0x10000000; +pub const CLONE_NEWPID: ::c_int = 0x20000000; +pub const CLONE_NEWNET: ::c_int = 0x40000000; +pub const CLONE_IO: ::c_int = 0x80000000; pub const WNOHANG: ::c_int = 1; |