Skip to content

Commit a230d2e

Browse files
committed
Auto merge of #2488 - rtzoeller:dfly_FIODNAME, r=JohnTitor
Deprecate FIODGNAME on DragonFly, add FIODNAME `FIODGNAME` is FreeBSD specific, but `FIODNAME` exists on DragonFly which appears to provide similar functionality. [FreeBSD definition](https://github.com/freebsd/freebsd-src/blob/dc6dd769de63c4eceb8899205a5d780d9f278fd2/sys/sys/filio.h#L60) [DragonFly definition](https://github.com/DragonFlyBSD/DragonFlyBSD/blob/20f6ddd0df90767e1eba2d12dfa8e1769be7cec7/sys/sys/filio.h#L59) `FIODGNAME` is appearing in the `libc-test` failures on DragonFly. Deprecate it, to be removed in a subsequent release.
2 parents 6cb6f69 + 4123992 commit a230d2e

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

src/unix/bsd/freebsdlike/dragonfly/mod.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -882,6 +882,13 @@ pub const EV_ERROR: u16 = 0x4000;
882882
pub const EV_EOF: u16 = 0x8000;
883883
pub const EV_SYSFLAGS: u16 = 0xf000;
884884

885+
pub const FIODNAME: ::c_ulong = 0x80106678;
886+
#[deprecated(
887+
since = "0.2.106",
888+
note = "FIODGNAME is not defined on DragonFly BSD. See FIODNAME."
889+
)]
890+
pub const FIODGNAME: ::c_ulong = 0x80106678;
891+
885892
pub const NOTE_TRIGGER: u32 = 0x01000000;
886893
pub const NOTE_FFNOP: u32 = 0x00000000;
887894
pub const NOTE_FFAND: u32 = 0x40000000;

src/unix/bsd/freebsdlike/freebsd/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,6 +1047,7 @@ pub const H4DISC: ::c_int = 0x7;
10471047

10481048
pub const BIOCSETFNR: ::c_ulong = 0x80104282;
10491049

1050+
pub const FIODGNAME: ::c_ulong = 0x80106678;
10501051
pub const FIONWRITE: ::c_ulong = 0x40046677;
10511052
pub const FIONSPACE: ::c_ulong = 0x40046676;
10521053
pub const FIOSEEKDATA: ::c_ulong = 0xc0086661;

src/unix/bsd/freebsdlike/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1260,7 +1260,6 @@ pub const BIOCGRTIMEOUT: ::c_ulong = 0x4010426e;
12601260

12611261
pub const FIODTYPE: ::c_ulong = 0x4004667a;
12621262
pub const FIOGETLBA: ::c_ulong = 0x40046679;
1263-
pub const FIODGNAME: ::c_ulong = 0x80106678;
12641263

12651264
pub const B0: speed_t = 0;
12661265
pub const B50: speed_t = 50;

0 commit comments

Comments
 (0)