diff options
| author | bors <bors@rust-lang.org> | 2023-06-17 13:19:29 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-06-17 13:19:29 +0000 |
| commit | e1c29d137dd779dcfce447d8d149ee6b8e9bdf78 (patch) | |
| tree | 4b52c6fafae8b2815f2503d0d57efa0355d9bbf6 /library/std/src | |
| parent | 7513407ac8e673f536d34743fe393bd8b7c45441 (diff) | |
| parent | 981a2a2c00cd3a8eade46dc198c47ca5f06b0105 (diff) | |
| download | rust-e1c29d137dd779dcfce447d8d149ee6b8e9bdf78.tar.gz rust-e1c29d137dd779dcfce447d8d149ee6b8e9bdf78.zip | |
Auto merge of #112739 - matthiaskrgr:rollup-8cfggml, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #112352 (Fix documentation build on FreeBSD) - #112644 (Correct types in method descriptions of `NonZero*` types) - #112683 (fix ICE on specific malformed asm clobber_abi) - #112707 ([rustdoc] Fix invalid handling of "going back in history" when "go to only search result" setting is enabled) - #112719 (Replace fvdl with ffx, allow test without install) - #112728 (Add `<meta charset="utf-8">` to `-Zdump-mir-spanview` output) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/os/unix/net/ancillary.rs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/library/std/src/os/unix/net/ancillary.rs b/library/std/src/os/unix/net/ancillary.rs index 814f1c7c283..218536689fd 100644 --- a/library/std/src/os/unix/net/ancillary.rs +++ b/library/std/src/os/unix/net/ancillary.rs @@ -11,7 +11,13 @@ use crate::slice::from_raw_parts; use crate::sys::net::Socket; // FIXME(#43348): Make libc adapt #[doc(cfg(...))] so we don't need these fake definitions here? -#[cfg(all(doc, not(target_os = "linux"), not(target_os = "android"), not(target_os = "netbsd")))] +#[cfg(all( + doc, + not(target_os = "linux"), + not(target_os = "android"), + not(target_os = "netbsd"), + not(target_os = "freebsd") +))] #[allow(non_camel_case_types)] mod libc { pub use libc::c_int; |