Merge pull request #10 from Txuritan/master

Fix for Android aarch64 socket type
deprecrated · Apr 26, 2018 · ec86ae1 · ec86ae1
2 parents e9967bc + 9f9eb59
commit ec86ae1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/datagram.rs b/src/datagram.rs
@@ -10,6 +10,7 @@ use mio::unix::EventedFd;
 use mio::{Poll, Token, Ready, PollOpt};
 
 use cvt;
+use Len;
 use socket::{sockaddr_un, Socket};
 
 /// A Unix datagram socket.
@@ -30,7 +31,7 @@ impl UnixDatagram {
             let fd = try!(Socket::new(libc::SOCK_DGRAM));
 
             let addr = &addr as *const _ as *const _;
-            try!(cvt(libc::bind(fd.fd(), addr, len)));
+            try!(cvt(libc::bind(fd.fd(), addr, len as Len)));
 
             Ok(UnixDatagram::from_raw_fd(fd.into_fd()))
         }

diff --git a/src/lib.rs b/src/lib.rs
@@ -19,6 +19,11 @@ pub use stream::UnixStream;
 pub use listener::UnixListener;
 pub use datagram::UnixDatagram;
 
+#[cfg(not(all(target_arch = "aarch64",target_os = "android")))]
+type Len = u32;
+#[cfg(all(target_arch = "aarch64",target_os = "android"))]
+type Len = i32;
+
 fn cvt(i: libc::c_int) -> io::Result<libc::c_int> {
     if i == -1 {
         Err(io::Error::last_os_error())

diff --git a/src/listener.rs b/src/listener.rs
@@ -10,6 +10,7 @@ use mio::{Poll, Token, Ready, PollOpt};
 
 use UnixStream;
 use cvt;
+use Len;
 use socket::{sockaddr_un, Socket};
 
 /// A structure representing a Unix domain socket server.
@@ -34,7 +35,7 @@ impl UnixListener {
             let fd = try!(Socket::new(libc::SOCK_STREAM));
 
             let addr = &addr as *const _ as *const _;
-            try!(cvt(libc::bind(fd.fd(), addr, len)));
+            try!(cvt(libc::bind(fd.fd(), addr, len as Len)));
             try!(cvt(libc::listen(fd.fd(), 128)));
 
             Ok(UnixListener::from_raw_fd(fd.into_fd()))