From 18b490b7953735328501c6f7e54522a91220caf3 Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Sat, 10 Nov 2018 22:34:26 +0000 Subject: user/rust: Bump to 1.30.1 --- ...ix-F_SETLK-F_SETLKW-on-32-bit-O_LARGEFILE.patch | 27 ---------------------- 1 file changed, 27 deletions(-) delete mode 100644 user/rust/0015-flock-Fix-F_SETLK-F_SETLKW-on-32-bit-O_LARGEFILE.patch (limited to 'user/rust/0015-flock-Fix-F_SETLK-F_SETLKW-on-32-bit-O_LARGEFILE.patch') diff --git a/user/rust/0015-flock-Fix-F_SETLK-F_SETLKW-on-32-bit-O_LARGEFILE.patch b/user/rust/0015-flock-Fix-F_SETLK-F_SETLKW-on-32-bit-O_LARGEFILE.patch deleted file mode 100644 index de9661d3a..000000000 --- a/user/rust/0015-flock-Fix-F_SETLK-F_SETLKW-on-32-bit-O_LARGEFILE.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 9c13dec5a526a4a66dc45453ab1808ab9a1bb10b Mon Sep 17 00:00:00 2001 -From: Samuel Holland -Date: Tue, 9 Oct 2018 04:15:48 +0000 -Subject: [PATCH 15/29] flock: Fix F_SETLK/F_SETLKW on 32-bit O_LARGEFILE - ---- - src/librustc_data_structures/flock.rs | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/librustc_data_structures/flock.rs b/src/librustc_data_structures/flock.rs -index ff1ebb11b7..d85017ec50 100644 ---- a/src/librustc_data_structures/flock.rs -+++ b/src/librustc_data_structures/flock.rs -@@ -46,8 +46,8 @@ mod imp { - pub const F_RDLCK: libc::c_short = 0; - pub const F_WRLCK: libc::c_short = 1; - pub const F_UNLCK: libc::c_short = 2; -- pub const F_SETLK: libc::c_int = 6; -- pub const F_SETLKW: libc::c_int = 7; -+ pub const F_SETLK: libc::c_int = libc::F_SETLK; -+ pub const F_SETLKW: libc::c_int = libc::F_SETLKW; - } - - #[cfg(target_os = "freebsd")] --- -2.18.0 - -- cgit v1.2.3-70-g09d2