diff options
| author | Jarred Allen <jarred@moveparallel.com> | 2023-05-22 14:36:59 -0700 |
|---|---|---|
| committer | Jarred Allen <jarred@moveparallel.com> | 2023-05-22 14:36:59 -0700 |
| commit | 3174d85d085a3d5dc64908ea12366698233645d5 (patch) | |
| tree | 87f77bc23fc3de4b3f8fb901eaaa95657f5765e2 /src/sys/socket | |
| parent | ff0fb3d18776151d0c8694f564ffb21164d1e17f (diff) | |
| parent | c6f9e2332efcf62c751d7a0174bb791e732b90a8 (diff) | |
| download | nix-3174d85d085a3d5dc64908ea12366698233645d5.zip | |
Merge branch 'master' into set-sockaddr-length-linux
Diffstat (limited to 'src/sys/socket')
| -rw-r--r-- | src/sys/socket/mod.rs | 2 | ||||
| -rw-r--r-- | src/sys/socket/sockopt.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/sys/socket/mod.rs b/src/sys/socket/mod.rs index ffab9741..c77bc961 100644 --- a/src/sys/socket/mod.rs +++ b/src/sys/socket/mod.rs @@ -236,7 +236,7 @@ impl SockProtocol { #[allow(non_upper_case_globals)] pub const CanBcm: SockProtocol = SockProtocol::NetlinkUserSock; // Matches libc::CAN_BCM } -#[cfg(any(target_os = "linux"))] +#[cfg(target_os = "linux")] libc_bitflags! { /// Configuration flags for `SO_TIMESTAMPING` interface /// diff --git a/src/sys/socket/sockopt.rs b/src/sys/socket/sockopt.rs index a18b5905..d5bcda4c 100644 --- a/src/sys/socket/sockopt.rs +++ b/src/sys/socket/sockopt.rs @@ -683,7 +683,7 @@ sockopt_impl!( libc::IP6T_SO_ORIGINAL_DST, libc::sockaddr_in6 ); -#[cfg(any(target_os = "linux"))] +#[cfg(target_os = "linux")] sockopt_impl!( /// Specifies exact type of timestamping information collected by the kernel /// [Further reading](https://www.kernel.org/doc/html/latest/networking/timestamping.html) @@ -702,7 +702,7 @@ sockopt_impl!( libc::SO_TIMESTAMP, bool ); -#[cfg(all(target_os = "linux"))] +#[cfg(target_os = "linux")] sockopt_impl!( /// Enable or disable the receiving of the `SO_TIMESTAMPNS` control message. ReceiveTimestampns, |