diff options
| author | bors <bors@rust-lang.org> | 2023-04-20 08:39:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-20 08:39:02 +0000 |
| commit | 79b7d3c7520a29c98f346285b1184091fd36fff2 (patch) | |
| tree | e40f57598ba2ce86c197e67bf363232e3f407a4c /src/unix | |
| parent | a964608984589fb4190304e7cad14afec993a250 (diff) | |
| parent | 595c2aba82937ab954037c1ebe4baf5f88afe9b4 (diff) | |
| download | rust-libc-79b7d3c7520a29c98f346285b1184091fd36fff2.tar.gz | |
Auto merge of #3171 - Toasterson:master, r=JohnTitor,pfmooney
fix: CMSG_HEADER_ALIGNMENT was not properly equal to the C Header file in illumos
A small fix for illumos so we can add more archs to the definition. This aligns the defintions in libc with the corresponding C Headers.
I ran all the steps it asked me and only got an issue with `cc1: note: unrecognized command-line option '-Wno-unknown-warning-option' may have been intended to silence earlier diagnostics` although that seems to me like I am using a different gcc that CI.
This is part of the ARM work goin on at the moment.
CC: `@richlowe` and `@jclulow` for coordination.
Diffstat (limited to 'src/unix')
| -rw-r--r-- | src/unix/solarish/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/unix/solarish/mod.rs b/src/unix/solarish/mod.rs index 12c88f31a1..cc688331f4 100644 --- a/src/unix/solarish/mod.rs +++ b/src/unix/solarish/mod.rs @@ -2579,7 +2579,7 @@ pub const AT_SUN_FPTYPE: ::c_uint = 2027; // and 4 bytes everywhere else: #[cfg(target_arch = "sparc64")] const _CMSG_HDR_ALIGNMENT: usize = 8; -#[cfg(any(target_arch = "x86", target_arch = "x86_64"))] +#[cfg(not(target_arch = "sparc64"))] const _CMSG_HDR_ALIGNMENT: usize = 4; const _CMSG_DATA_ALIGNMENT: usize = ::mem::size_of::<::c_int>(); |