Patrick Williams | 8e7b46e | 2023-05-01 14:19:06 -0500 | [diff] [blame^] | 1 | From e4f6d7b6d57e83633814c54d93dff292ed0e4609 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 8 Apr 2023 09:01:54 -0700 |
| 4 | Subject: [PATCH] musl: Move F_OFD_GETLK, F_OFD_SETLK and F_OFD_SETLKW to |
| 5 | common location |
| 6 | |
| 7 | These defines are not architecture specific in musl [1] therefore move them |
| 8 | to be common |
| 9 | |
| 10 | [1] https://git.musl-libc.org/cgit/musl/tree/include/fcntl.h#n48 |
| 11 | |
| 12 | Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/3191] |
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 14 | --- |
| 15 | src/unix/linux_like/linux/musl/b32/arm/mod.rs | 3 --- |
| 16 | src/unix/linux_like/linux/musl/b32/hexagon.rs | 3 --- |
| 17 | src/unix/linux_like/linux/musl/b32/mips/mod.rs | 3 --- |
| 18 | src/unix/linux_like/linux/musl/b32/powerpc.rs | 3 --- |
| 19 | src/unix/linux_like/linux/musl/b32/x86/mod.rs | 3 --- |
| 20 | src/unix/linux_like/linux/musl/b64/aarch64/mod.rs | 3 --- |
| 21 | src/unix/linux_like/linux/musl/b64/mips64.rs | 3 --- |
| 22 | src/unix/linux_like/linux/musl/mod.rs | 4 ++++ |
| 23 | 8 files changed, 4 insertions(+), 21 deletions(-) |
| 24 | |
| 25 | diff --git a/src/unix/linux_like/linux/musl/b32/arm/mod.rs b/src/unix/linux_like/linux/musl/b32/arm/mod.rs |
| 26 | index c47fa2c4c..3c8978e4f 100644 |
| 27 | --- a/src/unix/linux_like/linux/musl/b32/arm/mod.rs |
| 28 | +++ b/src/unix/linux_like/linux/musl/b32/arm/mod.rs |
| 29 | @@ -451,9 +451,6 @@ pub const F_GETOWN: ::c_int = 9; |
| 30 | pub const F_SETLK: ::c_int = 13; |
| 31 | pub const F_SETLKW: ::c_int = 14; |
| 32 | pub const F_SETOWN: ::c_int = 8; |
| 33 | -pub const F_OFD_GETLK: ::c_int = 36; |
| 34 | -pub const F_OFD_SETLK: ::c_int = 37; |
| 35 | -pub const F_OFD_SETLKW: ::c_int = 38; |
| 36 | |
| 37 | pub const VEOF: usize = 4; |
| 38 | pub const VEOL: usize = 11; |
| 39 | diff --git a/src/unix/linux_like/linux/musl/b32/hexagon.rs b/src/unix/linux_like/linux/musl/b32/hexagon.rs |
| 40 | index f83d208d5..720c603da 100644 |
| 41 | --- a/src/unix/linux_like/linux/musl/b32/hexagon.rs |
| 42 | +++ b/src/unix/linux_like/linux/musl/b32/hexagon.rs |
| 43 | @@ -225,9 +225,6 @@ pub const F_GETOWN_EX: ::c_int = 16; |
| 44 | pub const F_GETSIG: ::c_int = 11; |
| 45 | pub const F_LINUX_SPECIFIC_BASE: ::c_int = 1024; |
| 46 | pub const FLUSHO: ::c_int = 4096; |
| 47 | -pub const F_OFD_GETLK: ::c_int = 36; |
| 48 | -pub const F_OFD_SETLK: ::c_int = 37; |
| 49 | -pub const F_OFD_SETLKW: ::c_int = 38; |
| 50 | pub const F_OWNER_PGRP: ::c_int = 2; |
| 51 | pub const F_OWNER_PID: ::c_int = 1; |
| 52 | pub const F_OWNER_TID: ::c_int = 0; |
| 53 | diff --git a/src/unix/linux_like/linux/musl/b32/mips/mod.rs b/src/unix/linux_like/linux/musl/b32/mips/mod.rs |
| 54 | index d09b8278e..69e20ce32 100644 |
| 55 | --- a/src/unix/linux_like/linux/musl/b32/mips/mod.rs |
| 56 | +++ b/src/unix/linux_like/linux/musl/b32/mips/mod.rs |
| 57 | @@ -388,9 +388,6 @@ pub const F_GETOWN: ::c_int = 23; |
| 58 | pub const F_SETLK: ::c_int = 34; |
| 59 | pub const F_SETLKW: ::c_int = 35; |
| 60 | pub const F_SETOWN: ::c_int = 24; |
| 61 | -pub const F_OFD_GETLK: ::c_int = 36; |
| 62 | -pub const F_OFD_SETLK: ::c_int = 37; |
| 63 | -pub const F_OFD_SETLKW: ::c_int = 38; |
| 64 | |
| 65 | pub const VEOF: usize = 16; |
| 66 | pub const VEOL: usize = 17; |
| 67 | diff --git a/src/unix/linux_like/linux/musl/b32/powerpc.rs b/src/unix/linux_like/linux/musl/b32/powerpc.rs |
| 68 | index 3b998329b..63bc9163d 100644 |
| 69 | --- a/src/unix/linux_like/linux/musl/b32/powerpc.rs |
| 70 | +++ b/src/unix/linux_like/linux/musl/b32/powerpc.rs |
| 71 | @@ -384,9 +384,6 @@ pub const F_GETOWN: ::c_int = 9; |
| 72 | pub const F_SETLK: ::c_int = 13; |
| 73 | pub const F_SETLKW: ::c_int = 14; |
| 74 | pub const F_SETOWN: ::c_int = 8; |
| 75 | -pub const F_OFD_GETLK: ::c_int = 36; |
| 76 | -pub const F_OFD_SETLK: ::c_int = 37; |
| 77 | -pub const F_OFD_SETLKW: ::c_int = 38; |
| 78 | |
| 79 | pub const VEOF: usize = 4; |
| 80 | pub const VEOL: usize = 6; |
| 81 | diff --git a/src/unix/linux_like/linux/musl/b32/x86/mod.rs b/src/unix/linux_like/linux/musl/b32/x86/mod.rs |
| 82 | index c319b91b6..52ecf3c7e 100644 |
| 83 | --- a/src/unix/linux_like/linux/musl/b32/x86/mod.rs |
| 84 | +++ b/src/unix/linux_like/linux/musl/b32/x86/mod.rs |
| 85 | @@ -441,9 +441,6 @@ pub const F_GETOWN: ::c_int = 9; |
| 86 | pub const F_SETLK: ::c_int = 13; |
| 87 | pub const F_SETLKW: ::c_int = 14; |
| 88 | pub const F_SETOWN: ::c_int = 8; |
| 89 | -pub const F_OFD_GETLK: ::c_int = 36; |
| 90 | -pub const F_OFD_SETLK: ::c_int = 37; |
| 91 | -pub const F_OFD_SETLKW: ::c_int = 38; |
| 92 | |
| 93 | pub const VEOF: usize = 4; |
| 94 | pub const VEOL: usize = 11; |
| 95 | diff --git a/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs b/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs |
| 96 | index 14b4bc6d6..522493ff3 100644 |
| 97 | --- a/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs |
| 98 | +++ b/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs |
| 99 | @@ -250,9 +250,6 @@ pub const F_GETOWN: ::c_int = 9; |
| 100 | pub const F_SETLK: ::c_int = 6; |
| 101 | pub const F_SETLKW: ::c_int = 7; |
| 102 | pub const F_SETOWN: ::c_int = 8; |
| 103 | -pub const F_OFD_GETLK: ::c_int = 36; |
| 104 | -pub const F_OFD_SETLK: ::c_int = 37; |
| 105 | -pub const F_OFD_SETLKW: ::c_int = 38; |
| 106 | |
| 107 | pub const VEOF: usize = 4; |
| 108 | |
| 109 | diff --git a/src/unix/linux_like/linux/musl/b64/mips64.rs b/src/unix/linux_like/linux/musl/b64/mips64.rs |
| 110 | index 22ac91690..c7f041260 100644 |
| 111 | --- a/src/unix/linux_like/linux/musl/b64/mips64.rs |
| 112 | +++ b/src/unix/linux_like/linux/musl/b64/mips64.rs |
| 113 | @@ -612,9 +612,6 @@ pub const F_GETOWN: ::c_int = 23; |
| 114 | pub const F_SETOWN: ::c_int = 24; |
| 115 | pub const F_SETLK: ::c_int = 6; |
| 116 | pub const F_SETLKW: ::c_int = 7; |
| 117 | -pub const F_OFD_GETLK: ::c_int = 36; |
| 118 | -pub const F_OFD_SETLK: ::c_int = 37; |
| 119 | -pub const F_OFD_SETLKW: ::c_int = 38; |
| 120 | |
| 121 | pub const MCL_CURRENT: ::c_int = 0x0001; |
| 122 | pub const MCL_FUTURE: ::c_int = 0x0002; |
| 123 | diff --git a/src/unix/linux_like/linux/musl/mod.rs b/src/unix/linux_like/linux/musl/mod.rs |
| 124 | index 37a8ca2af..9a4fa7ca7 100644 |
| 125 | --- a/src/unix/linux_like/linux/musl/mod.rs |
| 126 | +++ b/src/unix/linux_like/linux/musl/mod.rs |
| 127 | @@ -506,6 +506,10 @@ pub const ECOMM: ::c_int = 70; |
| 128 | pub const EPROTO: ::c_int = 71; |
| 129 | pub const EDOTDOT: ::c_int = 73; |
| 130 | |
| 131 | +pub const F_OFD_GETLK: ::c_int = 36; |
| 132 | +pub const F_OFD_SETLK: ::c_int = 37; |
| 133 | +pub const F_OFD_SETLKW: ::c_int = 38; |
| 134 | + |
| 135 | pub const F_RDLCK: ::c_int = 0; |
| 136 | pub const F_WRLCK: ::c_int = 1; |
| 137 | pub const F_UNLCK: ::c_int = 2; |
| 138 | -- |
| 139 | 2.40.0 |
| 140 | |