Replace ip(v6)_mreq structs with libc equivalent

Author: Bryant Mairs

src/sys/socket/mod.rs

@@ -12,7 +12,6 @@ use sys::uio::IoVec;
 
 mod addr;
 mod ffi;
-mod multicast;
 pub mod sockopt;
 
 /*
@@ -36,20 +35,16 @@ pub use ::sys::socket::addr::netlink::NetlinkAddr;
 pub use libc::{
     in_addr,
     in6_addr,
+    ip_mreq,
+    ipv6_mreq,
+    sa_family_t,
     sockaddr,
     sockaddr_in,
     sockaddr_in6,
+    sockaddr_storage,
     sockaddr_un,
-    sa_family_t,
 };
 
-pub use self::multicast::{
-    ip_mreq,
-    ipv6_mreq,
-};
-
-pub use libc::sockaddr_storage;
-
 /// These constants are used to specify the communication semantics
 /// when creating a socket with [`socket()`](fn.socket.html)
 #[derive(Clone, Copy, PartialEq, Eq, Debug)]