Skip to content

Commit 722fedd

Browse files
committed
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.
2 parents d9f256e + ae69a16 commit 722fedd

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

src/unix/notbsd/linux/mod.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -378,13 +378,6 @@ pub const EFD_SEMAPHORE: ::c_int = 0x1;
378378

379379
pub const NCCS: usize = 32;
380380

381-
pub const CLONE_NEWUTS: ::c_int = 0x04000000;
382-
pub const CLONE_NEWIPC: ::c_int = 0x08000000;
383-
pub const CLONE_NEWUSER: ::c_int = 0x10000000;
384-
pub const CLONE_NEWPID: ::c_int = 0x20000000;
385-
pub const CLONE_NEWNET: ::c_int = 0x40000000;
386-
pub const CLONE_IO: ::c_int = 0x80000000;
387-
388381
pub const AF_NETLINK: ::c_int = 16;
389382

390383
f! {

src/unix/notbsd/mod.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,12 @@ pub const CLONE_CHILD_CLEARTID: ::c_int = 0x200000;
539539
pub const CLONE_DETACHED: ::c_int = 0x400000;
540540
pub const CLONE_UNTRACED: ::c_int = 0x800000;
541541
pub const CLONE_CHILD_SETTID: ::c_int = 0x01000000;
542+
pub const CLONE_NEWUTS: ::c_int = 0x04000000;
543+
pub const CLONE_NEWIPC: ::c_int = 0x08000000;
544+
pub const CLONE_NEWUSER: ::c_int = 0x10000000;
545+
pub const CLONE_NEWPID: ::c_int = 0x20000000;
546+
pub const CLONE_NEWNET: ::c_int = 0x40000000;
547+
pub const CLONE_IO: ::c_int = 0x80000000;
542548

543549
pub const WNOHANG: ::c_int = 1;
544550

0 commit comments

Comments
 (0)