Skip to content

Commit 89e0ff1

Browse files
authored
Merge pull request #4488 from asomers/fbsd15-june-2025
Fix CI on FreeBSD 15
2 parents a56667a + 46b90a8 commit 89e0ff1

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
@@ -2574,7 +2574,7 @@ fn test_freebsd(target: &str) {
25742574
"TDF_CANSWAP" | "TDF_SWAPINREQ" => true,
25752575

25762576
// Unaccessible in FreeBSD 15
2577-
"TDI_SWAPPED" | "P_SWAPPINGOUT" | "P_SWAPPINGIN" => true,
2577+
"TDI_SWAPPED" | "P_SWAPPINGOUT" | "P_SWAPPINGIN" | "P_UNUSED3" => true,
25782578

25792579
// Removed in FreeBSD 14 (git a6b55ee6be1)
25802580
"IFF_KNOWSEPOCH" => true,
@@ -2986,6 +2986,8 @@ fn test_freebsd(target: &str) {
29862986
// `tcp_snd_wscale` and `tcp_rcv_wscale` are bitfields
29872987
("tcp_info", "tcp_snd_wscale") => true,
29882988
("tcp_info", "tcp_rcv_wscale") => true,
2989+
// mc_spare can change in size between OS releases. It's a spare field, after all.
2990+
("__mcontext", "mc_spare") => true,
29892991

29902992
_ => false,
29912993
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4186,7 +4186,9 @@ pub const TDI_IWAIT: c_int = 0x0010;
41864186
pub const P_ADVLOCK: c_int = 0x00000001;
41874187
pub const P_CONTROLT: c_int = 0x00000002;
41884188
pub const P_KPROC: c_int = 0x00000004;
4189+
#[deprecated(since = "1.0", note = "Replaced in FreeBSD 15 by P_IDLEPROC")]
41894190
pub const P_UNUSED3: c_int = 0x00000008;
4191+
pub const P_IDLEPROC: c_int = 0x00000008;
41904192
pub const P_PPWAIT: c_int = 0x00000010;
41914193
pub const P_PROFIL: c_int = 0x00000020;
41924194
pub const P_STOPPROF: c_int = 0x00000040;

0 commit comments

Comments
 (0)