diff options
author | bors <bors@rust-lang.org> | 2019-05-28 17:18:53 +0000 |
---|---|---|
committer | bors <bors@rust-lang.org> | 2019-05-28 17:18:53 +0000 |
commit | c9fbd006331cac6b5d77d024d0c26fbee4d6b573 (patch) | |
tree | ff32a1ffbb7116feb4346d8a9e1e0c1bf3274d5c | |
parent | 927ccfd4b0aeccf38b7746f8cbf92d596c360fbc (diff) | |
parent | 73643694b319fee932d3b5af965d28057a9c723e (diff) | |
download | rust-libc-c9fbd006331cac6b5d77d024d0c26fbee4d6b573.tar.gz |
Auto merge of #1372 - tklauser:f-seal-future-write, r=gnzlbg
Add F_SEAL_FUTURE_WRITE on Linux/Android
This was added in Linux 5.1 and will only show up in the next glibc
release, thus skip in tests.
-rw-r--r-- | libc-test/build.rs | 2 | ||||
-rw-r--r-- | src/unix/notbsd/linux/mod.rs | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libc-test/build.rs b/libc-test/build.rs index d828b9fe3d..b199d1cfbc 100644 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -2130,6 +2130,8 @@ fn test_linux(target: &str) { // Require Linux kernel 5.x: | "MSG_COPY" if musl => true, + // Require Linux kernel 5.1: + "F_SEAL_FUTURE_WRITE" => true, // The musl version 1.0.22 used in CI does not // contain these glibc constants yet: diff --git a/src/unix/notbsd/linux/mod.rs b/src/unix/notbsd/linux/mod.rs index 1e13d1bf3b..f29e8d1222 100644 --- a/src/unix/notbsd/linux/mod.rs +++ b/src/unix/notbsd/linux/mod.rs @@ -1082,6 +1082,8 @@ pub const F_TEST: ::c_int = 3; pub const F_TLOCK: ::c_int = 2; pub const F_ULOCK: ::c_int = 0; +pub const F_SEAL_FUTURE_WRITE: ::c_int = 0x0010; + pub const IFF_LOWER_UP: ::c_int = 0x10000; pub const IFF_DORMANT: ::c_int = 0x20000; pub const IFF_ECHO: ::c_int = 0x40000; |