summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSébastien Marie <semarie@online.fr>2018-07-14 06:57:09 +0200
committerSébastien Marie <semarie@online.fr>2018-07-14 06:57:09 +0200
commit280976e0d34625ef5b9e4240e31716489b69c4b7 (patch)
treea506afafa9dc29c7d0e56c692d5f8fea18676ca4
parent9d203f5ce97ca5c1fba1251f76cc402745c90bc3 (diff)
downloadrust-libc-280976e0d34625ef5b9e4240e31716489b69c4b7.tar.gz
fix struct arphdr alignment on OpenBSD
-rw-r--r--src/unix/bsd/netbsdlike/mod.rs9
-rw-r--r--src/unix/bsd/netbsdlike/netbsd/mod.rs9
-rw-r--r--src/unix/bsd/netbsdlike/openbsdlike/mod.rs8
3 files changed, 17 insertions, 9 deletions
diff --git a/src/unix/bsd/netbsdlike/mod.rs b/src/unix/bsd/netbsdlike/mod.rs
index 62a0ffc059..6384a29f8c 100644
--- a/src/unix/bsd/netbsdlike/mod.rs
+++ b/src/unix/bsd/netbsdlike/mod.rs
@@ -57,15 +57,6 @@ s! {
pub l_type: ::c_short,
pub l_whence: ::c_short,
}
-
- #[repr(packed)]
- pub struct arphdr {
- pub ar_hrd: u16,
- pub ar_pro: u16,
- pub ar_hln: u8,
- pub ar_pln: u8,
- pub ar_op: u16,
- }
}
pub const D_T_FMT: ::nl_item = 0;
diff --git a/src/unix/bsd/netbsdlike/netbsd/mod.rs b/src/unix/bsd/netbsdlike/netbsd/mod.rs
index cf1d74842f..065f6bd36a 100644
--- a/src/unix/bsd/netbsdlike/netbsd/mod.rs
+++ b/src/unix/bsd/netbsdlike/netbsd/mod.rs
@@ -318,6 +318,15 @@ s! {
pub ipi_addr: ::in_addr,
pub ipi_ifindex: ::c_uint,
}
+
+ #[repr(packed)]
+ pub struct arphdr {
+ pub ar_hrd: u16,
+ pub ar_pro: u16,
+ pub ar_hln: u8,
+ pub ar_pln: u8,
+ pub ar_op: u16,
+ }
}
pub const AT_FDCWD: ::c_int = -100;
diff --git a/src/unix/bsd/netbsdlike/openbsdlike/mod.rs b/src/unix/bsd/netbsdlike/openbsdlike/mod.rs
index f75d7b35ac..bf5ddd2e7a 100644
--- a/src/unix/bsd/netbsdlike/openbsdlike/mod.rs
+++ b/src/unix/bsd/netbsdlike/openbsdlike/mod.rs
@@ -193,6 +193,14 @@ s! {
pub gid: ::gid_t,
pub pid: ::pid_t,
}
+
+ pub struct arphdr {
+ pub ar_hrd: u16,
+ pub ar_pro: u16,
+ pub ar_hln: u8,
+ pub ar_pln: u8,
+ pub ar_op: u16,
+ }
}
pub const UT_NAMESIZE: usize = 32;