summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-03-15 10:22:53 +0000
committerbors <bors@rust-lang.org>2022-03-15 10:22:53 +0000
commitea3ab532349796a84f751e4363b04c73ea762a51 (patch)
treecb01bf5817c25c1b465854adbf769954aac4ba23
parentf05cd2a19196c710ed29edba950f7e38906d6043 (diff)
parent8c60c9a95f84a649fe05f82c51227ccda3a627a0 (diff)
downloadrust-libc-ea3ab532349796a84f751e4363b04c73ea762a51.tar.gz
Auto merge of #2725 - Meziu:master, r=Amanieu
Horizon OS Nintendo 3DS - Fixed size of sockaddr_in The original API for the platform included these zeroed bytes at the end of the `sockaddr_in` struct, but the socket address calls (like `getsockname`) only write 8 bytes inside `sockaddr_storage`, making checks like the one in https://github.com/rust-lang/rust/blob/95561b336cf82a8250176eb3c61ea61c90e75d47/library/std/src/sys_common/net.rs#L109 faulty. Since `sockaddr_in` is a struct *not* used in internal functionality, it shouldn't be a problem to just get rid of them.
-rw-r--r--src/unix/newlib/horizon/mod.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/unix/newlib/horizon/mod.rs b/src/unix/newlib/horizon/mod.rs
index 7d3e6d02db..150b6d0580 100644
--- a/src/unix/newlib/horizon/mod.rs
+++ b/src/unix/newlib/horizon/mod.rs
@@ -35,7 +35,6 @@ s! {
pub sin_family: ::sa_family_t,
pub sin_port: ::in_port_t,
pub sin_addr: ::in_addr,
- pub sin_zero: [::c_uchar; 8],
}
pub struct sockaddr_in6 {