From 2d3608eb17c8935d0474bfc29a9d2460be0d3b4e Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Fri, 11 Sep 2015 12:55:05 -0700
Subject: [PATCH] Correct ip6_mreq => ipv6_mreq
---
libc-test/build.rs | 2 --
src/lib.rs | 12 ++++++------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/libc-test/build.rs b/libc-test/build.rs
index 9b4527ec..a4c493f7 100644
--- a/libc-test/build.rs
+++ b/libc-test/build.rs
@@ -141,8 +141,6 @@ impl<'a> TestGenerator<'a> {
s => s.to_string(),
}
}
- // Perhaps this should be renamed in libc...
- "ip6_mreq" => "struct ipv6_mreq".to_string(),
// Just pass all these through, no need for a "struct" prefix
"glob_t" |
diff --git a/src/lib.rs b/src/lib.rs
index fc2e6c2a..c6b5bd14 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -347,7 +347,7 @@ pub mod types {
pub imr_interface: in_addr,
}
#[repr(C)]
- #[derive(Copy, Clone)] pub struct ip6_mreq {
+ #[derive(Copy, Clone)] pub struct ipv6_mreq {
pub ipv6mr_multiaddr: in6_addr,
pub ipv6mr_interface: c_uint,
}
@@ -912,7 +912,7 @@ pub mod types {
pub imr_interface: in_addr,
}
#[repr(C)]
- #[derive(Copy, Clone)] pub struct ip6_mreq {
+ #[derive(Copy, Clone)] pub struct ipv6_mreq {
pub ipv6mr_multiaddr: in6_addr,
pub ipv6mr_interface: c_uint,
}
@@ -1274,7 +1274,7 @@ pub mod types {
pub imr_interface: in_addr,
}
#[repr(C)]
- #[derive(Copy, Clone)] pub struct ip6_mreq {
+ #[derive(Copy, Clone)] pub struct ipv6_mreq {
pub ipv6mr_multiaddr: in6_addr,
pub ipv6mr_interface: c_uint,
}
@@ -1561,7 +1561,7 @@ pub mod types {
pub imr_interface: in_addr,
}
#[repr(C)]
- #[derive(Copy, Clone)] pub struct ip6_mreq {
+ #[derive(Copy, Clone)] pub struct ipv6_mreq {
pub ipv6mr_multiaddr: in6_addr,
pub ipv6mr_interface: c_uint,
}
@@ -1788,7 +1788,7 @@ pub mod types {
pub imr_interface: in_addr,
}
#[repr(C)]
- #[derive(Copy, Clone)] pub struct ip6_mreq {
+ #[derive(Copy, Clone)] pub struct ipv6_mreq {
pub ipv6mr_multiaddr: in6_addr,
pub ipv6mr_interface: c_uint,
}
@@ -2233,7 +2233,7 @@ pub mod types {
}
#[repr(C)]
- #[derive(Copy, Clone)] pub struct ip6_mreq {
+ #[derive(Copy, Clone)] pub struct ipv6_mreq {
pub ipv6mr_multiaddr: in6_addr,
pub ipv6mr_interface: c_uint,
}
--
GitLab