summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuki Okushi <huyuumi.dev@gmail.com>2021-01-07 17:59:24 +0900
committerYuki Okushi <huyuumi.dev@gmail.com>2021-01-07 18:10:00 +0900
commit66500eeb187811a11d977fe3262580a27139c11a (patch)
treea67bdf7b61d043cfe803fe9e3ffe220e036f8491
parenta39cf0d704f045926a0c9873d631a6792c156308 (diff)
downloadrust-libc-66500eeb187811a11d977fe3262580a27139c11a.tar.gz
Move structs to `s_no_extra_traits`
-rw-r--r--src/unix/linux_like/linux/align.rs44
1 files changed, 23 insertions, 21 deletions
diff --git a/src/unix/linux_like/linux/align.rs b/src/unix/linux_like/linux/align.rs
index 31e9d77dbf..11f5504a5a 100644
--- a/src/unix/linux_like/linux/align.rs
+++ b/src/unix/linux_like/linux/align.rs
@@ -52,27 +52,6 @@ macro_rules! expand_align {
pub fd: ::c_int,
pub pid: ::c_int,
}
-
- // linux/can.h
- #[repr(align(8))]
- pub struct can_frame {
- pub can_id: canid_t,
- pub can_dlc: u8,
- __pad: u8,
- __res0: u8,
- __res1: u8,
- pub data: [u8; CAN_MAX_DLEN],
- }
-
- #[repr(align(8))]
- pub struct canfd_frame {
- pub can_id: canid_t,
- pub len: u8,
- pub flags: u8,
- __res0: u8,
- __res1: u8,
- pub data: [u8; CANFD_MAX_DLEN],
- }
}
s_no_extra_traits! {
@@ -137,6 +116,29 @@ macro_rules! expand_align {
pub struct pthread_rwlock_t {
size: [u8; ::__SIZEOF_PTHREAD_RWLOCK_T],
}
+
+ // linux/can.h
+ #[repr(align(8))]
+ #[allow(missing_debug_implementations)]
+ pub struct can_frame {
+ pub can_id: canid_t,
+ pub can_dlc: u8,
+ __pad: u8,
+ __res0: u8,
+ __res1: u8,
+ pub data: [u8; CAN_MAX_DLEN],
+ }
+
+ #[repr(align(8))]
+ #[allow(missing_debug_implementations)]
+ pub struct canfd_frame {
+ pub can_id: canid_t,
+ pub len: u8,
+ pub flags: u8,
+ __res0: u8,
+ __res1: u8,
+ pub data: [u8; CANFD_MAX_DLEN],
+ }
}
};
}