Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 12, 2016
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3074853
Delete definitions of MS_VERBOSE; it's deprecated in favor of the (mo…
jimblandy Jan 2, 2016
e773764
Remove MS_NOSEC and MS_BORN flags; these are not part of the public k…
jimblandy Jan 2, 2016
9b53e54
Don't #include <linux/fs.h>; libc's API is described by <sys/mount.h>.
jimblandy Jan 2, 2016
e91606d
Common up all definitions of MS_RMT_MASK, since they're all equal now.
jimblandy Jan 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion libc-test/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
3 changes: 0 additions & 3 deletions src/unix/notbsd/android/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 0 additions & 3 deletions src/unix/notbsd/linux/mips.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 0 additions & 4 deletions src/unix/notbsd/linux/musl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 0 additions & 6 deletions src/unix/notbsd/linux/other/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/unix/notbsd/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down