diff options
| author | bors <bors@rust-lang.org> | 2019-09-25 22:12:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-09-25 22:12:22 +0000 |
| commit | 44a063abff37b5191bc7f14da26e739031f4abc2 (patch) | |
| tree | b5623beb2093b2660c0550da1af23990cb219f46 /src/unix/linux_like/emscripten/align.rs | |
| parent | 90269e85baa534679ca0c29348a83c1918925a72 (diff) | |
| parent | 56d46471e7c8f10554d2551569ff3d3ef42eccf4 (diff) | |
| download | rust-libc-44a063abff37b5191bc7f14da26e739031f4abc2.tar.gz | |
Auto merge of #1531 - gnzlbg:fixs, r=gnzlbg
Fix max_align_t
Diffstat (limited to 'src/unix/linux_like/emscripten/align.rs')
| -rw-r--r-- | src/unix/linux_like/emscripten/align.rs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/unix/linux_like/emscripten/align.rs b/src/unix/linux_like/emscripten/align.rs index 8fa2186fc9..141570f88f 100644 --- a/src/unix/linux_like/emscripten/align.rs +++ b/src/unix/linux_like/emscripten/align.rs @@ -1,10 +1,7 @@ macro_rules! expand_align { () => { - #[derive(Copy, Clone, Debug, PartialEq)] - #[repr(C, align(8))] - pub struct max_align_t([f64; 2]); - s! { + #[allow(missing_debug_implementations)] #[repr(align(4))] pub struct pthread_mutex_t { size: [u8; ::__SIZEOF_PTHREAD_MUTEX_T], @@ -39,6 +36,13 @@ macro_rules! expand_align { pub struct pthread_cond_t { size: [u8; ::__SIZEOF_PTHREAD_COND_T], } + + #[allow(missing_debug_implementations)] + #[repr(align(8))] + pub struct max_align_t { + priv_: [f64; 2] + } + } cfg_if! { |