Skip to content

Commit 46673b8

Browse files
asomerstgross35
authored andcommitted
Fix CI on FreeBSD 15
A recent change has replaced an unused preprocessor symbol: P_UNUSED3 freebsd/freebsd-src@33be163 Another recent change has changed the size of a spare field: mc_spare freebsd/freebsd-src@eea3e4d (backport <#4488>) (cherry picked from commit 46b90a8)
1 parent 310a79b commit 46673b8

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

libc-test/build.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2641,7 +2641,7 @@ fn test_freebsd(target: &str) {
26412641
"TDF_CANSWAP" | "TDF_SWAPINREQ" => true,
26422642

26432643
// Unaccessible in FreeBSD 15
2644-
"TDI_SWAPPED" | "P_SWAPPINGOUT" | "P_SWAPPINGIN" => true,
2644+
"TDI_SWAPPED" | "P_SWAPPINGOUT" | "P_SWAPPINGIN" | "P_UNUSED3" => true,
26452645

26462646
// Removed in FreeBSD 14 (git a6b55ee6be1)
26472647
"IFF_KNOWSEPOCH" => true,
@@ -3062,6 +3062,8 @@ fn test_freebsd(target: &str) {
30623062
// `tcp_snd_wscale` and `tcp_rcv_wscale` are bitfields
30633063
("tcp_info", "tcp_snd_wscale") => true,
30643064
("tcp_info", "tcp_rcv_wscale") => true,
3065+
// mc_spare can change in size between OS releases. It's a spare field, after all.
3066+
("__mcontext", "mc_spare") => true,
30653067

30663068
_ => false,
30673069
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4217,7 +4217,9 @@ pub const TDI_IWAIT: c_int = 0x0010;
42174217
pub const P_ADVLOCK: c_int = 0x00000001;
42184218
pub const P_CONTROLT: c_int = 0x00000002;
42194219
pub const P_KPROC: c_int = 0x00000004;
4220+
#[deprecated(since = "1.0", note = "Replaced in FreeBSD 15 by P_IDLEPROC")]
42204221
pub const P_UNUSED3: c_int = 0x00000008;
4222+
pub const P_IDLEPROC: c_int = 0x00000008;
42214223
pub const P_PPWAIT: c_int = 0x00000010;
42224224
pub const P_PROFIL: c_int = 0x00000020;
42234225
pub const P_STOPPROF: c_int = 0x00000040;

0 commit comments

Comments
 (0)