Merge pull request #127 from jimblandy/no-linux-fs

libc-test's C program should not #include <linux/fs.h> on Linux

6 files changed, 1 insertions, 17 deletions

diff --git a/libc-test/build.rs b/libc-test/build.rs
index f425624d25..fb6fa42dbd 100644
--- a/libc-test/build.rs
+++ b/libc-test/build.rs
@@ -149,7 +149,6 @@ fn main() {
         if !musl {
             cfg.header("linux/netlink.h");
             cfg.header("linux/magic.h");
-            cfg.header("linux/fs.h");
 
             if !mips {
                 cfg.header("linux/quota.h");
diff --git a/src/unix/notbsd/android/mod.rs b/src/unix/notbsd/android/mod.rs
index 918137545b..25558d3d27 100644
--- a/src/unix/notbsd/android/mod.rs
+++ b/src/unix/notbsd/android/mod.rs
@@ -410,9 +410,6 @@ pub const IEXTEN: ::tcflag_t = 0x00008000;
 pub const TOSTOP: ::tcflag_t = 0x00000100;
 pub const FLUSHO: ::tcflag_t = 0x00001000;
 
-pub const MS_RMT_MASK: ::c_ulong = 0x800051;
-pub const MS_VERBOSE: ::c_ulong = 0x8000;
-
 pub const ADFS_SUPER_MAGIC: ::c_long = 0x0000adf5;
 pub const AFFS_SUPER_MAGIC: ::c_long = 0x0000adff;
 pub const CODA_SUPER_MAGIC: ::c_long = 0x73757245;
diff --git a/src/unix/notbsd/linux/mips.rs b/src/unix/notbsd/linux/mips.rs
index 2a1dc92670..6cd32ee857 100644
--- a/src/unix/notbsd/linux/mips.rs
+++ b/src/unix/notbsd/linux/mips.rs
@@ -356,9 +356,6 @@ pub const SIG_UNBLOCK: ::c_int = 0x2;
 
 pub const PTHREAD_STACK_MIN: ::size_t = 131072;
 
-pub const MS_VERBOSE: ::c_ulong = 0x8000;
-pub const MS_RMT_MASK: ::c_ulong = 0x2800051;
-
 pub const ADFS_SUPER_MAGIC: ::c_long = 0x0000adf5;
 pub const AFFS_SUPER_MAGIC: ::c_long = 0x0000adff;
 pub const CODA_SUPER_MAGIC: ::c_long = 0x73757245;
diff --git a/src/unix/notbsd/linux/musl.rs b/src/unix/notbsd/linux/musl.rs
index f9cf4e96a8..3c1d7b6d23 100644
--- a/src/unix/notbsd/linux/musl.rs
+++ b/src/unix/notbsd/linux/musl.rs
@@ -392,10 +392,6 @@ pub const MADV_DONTDUMP: ::c_int = 16;
 
 pub const EPOLLWAKEUP: ::c_int = 0x20000000;
 
-pub const MS_NOSEC: ::c_ulong = 0x10000000;
-pub const MS_BORN: ::c_ulong = 0x20000000;
-pub const MS_RMT_MASK: ::c_ulong = 0x800051;
-
 pub const MADV_HUGEPAGE: ::c_int = 14;
 pub const MADV_NOHUGEPAGE: ::c_int = 15;
 pub const MAP_HUGETLB: ::c_int = 0x040000;
diff --git a/src/unix/notbsd/linux/other/mod.rs b/src/unix/notbsd/linux/other/mod.rs
index 90e3d2580f..3f67597958 100644
--- a/src/unix/notbsd/linux/other/mod.rs
+++ b/src/unix/notbsd/linux/other/mod.rs
@@ -283,9 +283,6 @@ pub const RUSAGE_CHILDREN: ::c_int = -1;
 pub const ST_RELATIME: ::c_ulong = 4096;
 pub const NI_MAXHOST: ::socklen_t = 1025;
 
-pub const MS_VERBOSE: ::c_ulong = 0x8000;
-pub const MS_RMT_MASK: ::c_ulong = 0x800051;
-
 pub const ADFS_SUPER_MAGIC: ::c_long = 0x0000adf5;
 pub const AFFS_SUPER_MAGIC: ::c_long = 0x0000adff;
 pub const CODA_SUPER_MAGIC: ::c_long = 0x73757245;
@@ -357,9 +354,6 @@ pub const MADV_DONTDUMP: ::c_int = 16;
 
 pub const EPOLLWAKEUP: ::c_int = 0x20000000;
 
-pub const MS_NOSEC: ::c_ulong = 0x10000000;
-pub const MS_BORN: ::c_ulong = 0x20000000;
-
 pub const MADV_HUGEPAGE: ::c_int = 14;
 pub const MADV_NOHUGEPAGE: ::c_int = 15;
 pub const MAP_HUGETLB: ::c_int = 0x040000;
diff --git a/src/unix/notbsd/mod.rs b/src/unix/notbsd/mod.rs
index 5d18853c00..d69515676c 100644
--- a/src/unix/notbsd/mod.rs
+++ b/src/unix/notbsd/mod.rs
@@ -254,6 +254,7 @@ pub const MS_ACTIVE: ::c_ulong = 0x40000000;
 pub const MS_NOUSER: ::c_ulong = 0x80000000;
 pub const MS_MGC_VAL: ::c_ulong = 0xc0ed0000;
 pub const MS_MGC_MSK: ::c_ulong = 0xffff0000;
+pub const MS_RMT_MASK: ::c_ulong = 0x800051;
 
 pub const EPERM: ::c_int = 1;
 pub const ENOENT: ::c_int = 2;