Skip to content

Commit

Permalink
Merge pull request rust-lang#3614 from asomers/patch-2
Browse files Browse the repository at this point in the history
Update FreeBSD 13 CI image
  • Loading branch information
JohnTitor authored Apr 29, 2024
2 parents e6673b0 + bf968af commit 57a165b
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
task:
name: nightly x86_64-unknown-freebsd-13
freebsd_instance:
image_family: freebsd-13-2
image_family: freebsd-13-3
setup_script:
- pkg install -y libnghttp2 curl
- curl https://sh.rustup.rs -sSf --output rustup.sh
Expand Down
34 changes: 21 additions & 13 deletions src/unix/bsd/freebsdlike/freebsd/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1043,41 +1043,49 @@ s! {
pub tcpi_snd_rexmitpack: u32,
pub tcpi_rcv_ooopack: u32,
pub tcpi_snd_zerowin: u32,
#[cfg(freebsd13)]
pub __tcpi_delivered_ce: u32,
#[cfg(any(freebsd15, freebsd14))]
pub tcpi_delivered_ce: u32,
#[cfg(freebsd13)]
pub __tcpi_received_ce: u32,
#[cfg(any(freebsd15, freebsd14))]
pub tcpi_received_ce: u32,
#[cfg(any(freebsd15, freebsd14))]
#[cfg(any(freebsd15, freebsd14, freebsd13))]
pub __tcpi_delivered_e1_bytes: u32,
#[cfg(any(freebsd15, freebsd14))]
#[cfg(any(freebsd15, freebsd14, freebsd13))]
pub __tcpi_delivered_e0_bytes: u32,
#[cfg(any(freebsd15, freebsd14))]
#[cfg(any(freebsd15, freebsd14, freebsd13))]
pub __tcpi_delivered_ce_bytes: u32,
#[cfg(any(freebsd15, freebsd14))]
#[cfg(any(freebsd15, freebsd14, freebsd13))]
pub __tcpi_received_e1_bytes: u32,
#[cfg(any(freebsd15, freebsd14))]
#[cfg(any(freebsd15, freebsd14, freebsd13))]
pub __tcpi_received_e0_bytes: u32,
#[cfg(any(freebsd15, freebsd14))]
#[cfg(any(freebsd15, freebsd14, freebsd13))]
pub __tcpi_received_ce_bytes: u32,
#[cfg(freebsd13)]
pub __tcpi_total_tlp: u32,
#[cfg(any(freebsd15, freebsd14))]
pub tcpi_total_tlp: u32,
#[cfg(freebsd13)]
pub __tcpi_total_tlp_bytes: u64,
#[cfg(any(freebsd15, freebsd14))]
pub tcpi_total_tlp_bytes: u64,
#[cfg(any(freebsd15, freebsd14))]
#[cfg(any(freebsd15, freebsd14, freebsd13))]
pub tcpi_snd_una: u32,
#[cfg(any(freebsd15, freebsd14))]
#[cfg(any(freebsd15, freebsd14, freebsd13))]
pub tcpi_snd_max: u32,
#[cfg(any(freebsd15, freebsd14))]
#[cfg(any(freebsd15, freebsd14, freebsd13))]
pub tcpi_rcv_numsacks: u32,
#[cfg(any(freebsd15, freebsd14))]
#[cfg(any(freebsd15, freebsd14, freebsd13))]
pub tcpi_rcv_adv: u32,
#[cfg(any(freebsd15, freebsd14))]
#[cfg(any(freebsd15, freebsd14, freebsd13))]
pub tcpi_dupacks: u32,
#[cfg(freebsd14)]
#[cfg(any(freebsd14, freebsd13))]
pub __tcpi_pad: [u32; 10],
#[cfg(freebsd15)]
pub __tcpi_pad: [u32; 14],
#[cfg(not(any(freebsd15, freebsd14)))]
#[cfg(not(any(freebsd15, freebsd14, freebsd13)))]
pub __tcpi_pad: [u32; 26],
}

Expand Down

0 comments on commit 57a165b

Please sign in to comment.