Skip to content

Commit 518f6e4

Browse files
krajakiernan
authored andcommitted
musl: Move F_OFD_GETLK, F_OFD_SETLK and F_OFD_SETLKW to common location
These defines are not architecture specific in musl [1] therefore move them to be common [1] https://git.musl-libc.org/cgit/musl/tree/include/fcntl.h#n48
1 parent 36ef860 commit 518f6e4

File tree

12 files changed

+4
-33
lines changed

12 files changed

+4
-33
lines changed

src/unix/linux_like/linux/musl/b32/arm/mod.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -450,9 +450,6 @@ pub const F_GETOWN: ::c_int = 9;
450450
pub const F_SETLK: ::c_int = 13;
451451
pub const F_SETLKW: ::c_int = 14;
452452
pub const F_SETOWN: ::c_int = 8;
453-
pub const F_OFD_GETLK: ::c_int = 36;
454-
pub const F_OFD_SETLK: ::c_int = 37;
455-
pub const F_OFD_SETLKW: ::c_int = 38;
456453

457454
pub const VEOF: usize = 4;
458455
pub const VEOL: usize = 11;

src/unix/linux_like/linux/musl/b32/hexagon.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,6 @@ pub const F_GETOWN_EX: ::c_int = 16;
225225
pub const F_GETSIG: ::c_int = 11;
226226
pub const F_LINUX_SPECIFIC_BASE: ::c_int = 1024;
227227
pub const FLUSHO: ::c_int = 4096;
228-
pub const F_OFD_GETLK: ::c_int = 36;
229-
pub const F_OFD_SETLK: ::c_int = 37;
230-
pub const F_OFD_SETLKW: ::c_int = 38;
231228
pub const F_OWNER_PGRP: ::c_int = 2;
232229
pub const F_OWNER_PID: ::c_int = 1;
233230
pub const F_OWNER_TID: ::c_int = 0;

src/unix/linux_like/linux/musl/b32/mips/mod.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -387,9 +387,6 @@ pub const F_GETOWN: ::c_int = 23;
387387
pub const F_SETLK: ::c_int = 34;
388388
pub const F_SETLKW: ::c_int = 35;
389389
pub const F_SETOWN: ::c_int = 24;
390-
pub const F_OFD_GETLK: ::c_int = 36;
391-
pub const F_OFD_SETLK: ::c_int = 37;
392-
pub const F_OFD_SETLKW: ::c_int = 38;
393390

394391
pub const VEOF: usize = 16;
395392
pub const VEOL: usize = 17;

src/unix/linux_like/linux/musl/b32/powerpc.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -384,9 +384,6 @@ pub const F_GETOWN: ::c_int = 9;
384384
pub const F_SETLK: ::c_int = 13;
385385
pub const F_SETLKW: ::c_int = 14;
386386
pub const F_SETOWN: ::c_int = 8;
387-
pub const F_OFD_GETLK: ::c_int = 36;
388-
pub const F_OFD_SETLK: ::c_int = 37;
389-
pub const F_OFD_SETLKW: ::c_int = 38;
390387

391388
pub const VEOF: usize = 4;
392389
pub const VEOL: usize = 6;

src/unix/linux_like/linux/musl/b32/x86/mod.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -440,9 +440,6 @@ pub const F_GETOWN: ::c_int = 9;
440440
pub const F_SETLK: ::c_int = 13;
441441
pub const F_SETLKW: ::c_int = 14;
442442
pub const F_SETOWN: ::c_int = 8;
443-
pub const F_OFD_GETLK: ::c_int = 36;
444-
pub const F_OFD_SETLK: ::c_int = 37;
445-
pub const F_OFD_SETLKW: ::c_int = 38;
446443

447444
pub const VEOF: usize = 4;
448445
pub const VEOL: usize = 11;

src/unix/linux_like/linux/musl/b64/aarch64/mod.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,6 @@ pub const F_GETOWN: ::c_int = 9;
250250
pub const F_SETLK: ::c_int = 6;
251251
pub const F_SETLKW: ::c_int = 7;
252252
pub const F_SETOWN: ::c_int = 8;
253-
pub const F_OFD_GETLK: ::c_int = 36;
254-
pub const F_OFD_SETLK: ::c_int = 37;
255-
pub const F_OFD_SETLKW: ::c_int = 38;
256253

257254
pub const VEOF: usize = 4;
258255

src/unix/linux_like/linux/musl/b64/mips64.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -612,9 +612,6 @@ pub const F_GETOWN: ::c_int = 23;
612612
pub const F_SETOWN: ::c_int = 24;
613613
pub const F_SETLK: ::c_int = 6;
614614
pub const F_SETLKW: ::c_int = 7;
615-
pub const F_OFD_GETLK: ::c_int = 36;
616-
pub const F_OFD_SETLK: ::c_int = 37;
617-
pub const F_OFD_SETLKW: ::c_int = 38;
618615

619616
pub const MCL_CURRENT: ::c_int = 0x0001;
620617
pub const MCL_FUTURE: ::c_int = 0x0002;

src/unix/linux_like/linux/musl/b64/powerpc64.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,6 @@ pub const F_GETOWN: ::c_int = 9;
212212
pub const F_SETLK: ::c_int = 6;
213213
pub const F_SETLKW: ::c_int = 7;
214214
pub const F_SETOWN: ::c_int = 8;
215-
pub const F_OFD_GETLK: ::c_int = 36;
216-
pub const F_OFD_SETLK: ::c_int = 37;
217-
pub const F_OFD_SETLKW: ::c_int = 38;
218215

219216
pub const VEOF: usize = 4;
220217

src/unix/linux_like/linux/musl/b64/riscv64/mod.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -604,9 +604,6 @@ pub const F_GETOWN: ::c_int = 9;
604604
pub const F_SETLK: ::c_int = 6;
605605
pub const F_SETLKW: ::c_int = 7;
606606
pub const F_SETOWN: ::c_int = 8;
607-
pub const F_OFD_GETLK: ::c_int = 36;
608-
pub const F_OFD_SETLK: ::c_int = 37;
609-
pub const F_OFD_SETLKW: ::c_int = 38;
610607

611608
pub const VEOF: usize = 4;
612609

src/unix/linux_like/linux/musl/b64/s390x.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,6 @@ pub const F_GETOWN: ::c_int = 9;
297297
pub const F_SETOWN: ::c_int = 8;
298298
pub const F_SETLK: ::c_int = 6;
299299
pub const F_SETLKW: ::c_int = 7;
300-
pub const F_OFD_GETLK: ::c_int = 36;
301-
pub const F_OFD_SETLK: ::c_int = 37;
302-
pub const F_OFD_SETLKW: ::c_int = 38;
303300

304301
pub const VTIME: usize = 5;
305302
pub const VSWTC: usize = 7;

src/unix/linux_like/linux/musl/b64/x86_64/mod.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -805,9 +805,6 @@ pub const F_GETOWN: ::c_int = 9;
805805
pub const F_SETLK: ::c_int = 6;
806806
pub const F_SETLKW: ::c_int = 7;
807807
pub const F_SETOWN: ::c_int = 8;
808-
pub const F_OFD_GETLK: ::c_int = 36;
809-
pub const F_OFD_SETLK: ::c_int = 37;
810-
pub const F_OFD_SETLKW: ::c_int = 38;
811808

812809
pub const VEOF: usize = 4;
813810

src/unix/linux_like/linux/musl/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,10 @@ pub const ECOMM: ::c_int = 70;
512512
pub const EPROTO: ::c_int = 71;
513513
pub const EDOTDOT: ::c_int = 73;
514514

515+
pub const F_OFD_GETLK: ::c_int = 36;
516+
pub const F_OFD_SETLK: ::c_int = 37;
517+
pub const F_OFD_SETLKW: ::c_int = 38;
518+
515519
pub const F_RDLCK: ::c_int = 0;
516520
pub const F_WRLCK: ::c_int = 1;
517521
pub const F_UNLCK: ::c_int = 2;

0 commit comments

Comments
 (0)