OK, different strategy for fixing

This commit is contained in:
Alex Crichton
2015-09-16 16:36:30 -07:00
parent 848faedff8
commit d809601a92
4 changed files with 8 additions and 15 deletions
-5
View File
@@ -27,11 +27,6 @@ s! {
pub sun_family: sa_family_t,
pub sun_path: [c_char; 104]
}
pub struct ipv6_mreq {
pub ipv6mr_multiaddr: ::in6_addr,
pub ipv6mr_interface: ::c_uint,
}
}
extern {
+8
View File
@@ -56,6 +56,14 @@ s! {
pub imr_multiaddr: in_addr,
pub imr_interface: in_addr,
}
pub struct ipv6_mreq {
pub ipv6mr_multiaddr: in6_addr,
#[cfg(target_os = "android")]
pub ipv6mr_interface: c_uint,
#[cfg(not(target_os = "android"))]
pub ipv6mr_interface: c_int,
}
}
cfg_if! {
-5
View File
@@ -54,11 +54,6 @@ s! {
pub sched_policy: ::int32_t,
pub sched_priority: ::int32_t,
}
pub struct ipv6_mreq {
pub ipv6mr_multiaddr: ::in6_addr,
pub ipv6mr_interface: ::c_int,
}
}
pub const BUFSIZ: ::c_uint = 1024;
-5
View File
@@ -28,11 +28,6 @@ s! {
pub ifa_ifu: *mut ::sockaddr, // FIXME This should be a union
pub ifa_data: *mut ::c_void
}
pub struct ipv6_mreq {
pub ipv6mr_multiaddr: ::in6_addr,
pub ipv6mr_interface: ::c_uint,
}
}
pub const BUFSIZ: ::c_uint = 8192;