Skip to content

Commit 79b7d3c

Browse files
committed
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.
2 parents a964608 + 595c2ab commit 79b7d3c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/unix/solarish/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2579,7 +2579,7 @@ pub const AT_SUN_FPTYPE: ::c_uint = 2027;
25792579
// and 4 bytes everywhere else:
25802580
#[cfg(target_arch = "sparc64")]
25812581
const _CMSG_HDR_ALIGNMENT: usize = 8;
2582-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
2582+
#[cfg(not(target_arch = "sparc64"))]
25832583
const _CMSG_HDR_ALIGNMENT: usize = 4;
25842584

25852585
const _CMSG_DATA_ALIGNMENT: usize = ::mem::size_of::<::c_int>();

0 commit comments

Comments
 (0)