Skip to content

Commit 3435c60

Browse files
committed
Fix libc::bind call on aarch64-linux-android
1 parent 5798817 commit 3435c60

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/libstd/sys/unix/ext/net.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ impl UnixListener {
641641
let inner = Socket::new_raw(libc::AF_UNIX, libc::SOCK_STREAM)?;
642642
let (addr, len) = sockaddr_un(path)?;
643643

644-
cvt(libc::bind(*inner.as_inner(), &addr as *const _ as *const _, len))?;
644+
cvt(libc::bind(*inner.as_inner(), &addr as *const _ as *const _, len as _))?;
645645
cvt(libc::listen(*inner.as_inner(), 128))?;
646646

647647
Ok(UnixListener(inner))
@@ -920,7 +920,7 @@ impl UnixDatagram {
920920
let socket = UnixDatagram::unbound()?;
921921
let (addr, len) = sockaddr_un(path)?;
922922

923-
cvt(libc::bind(*socket.0.as_inner(), &addr as *const _ as *const _, len))?;
923+
cvt(libc::bind(*socket.0.as_inner(), &addr as *const _ as *const _, len as _))?;
924924

925925
Ok(socket)
926926
}

src/libstd/sys_common/net.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ impl TcpListener {
339339

340340
// Bind our new socket
341341
let (addrp, len) = addr.into_inner();
342-
cvt(unsafe { c::bind(*sock.as_inner(), addrp, len) })?;
342+
cvt(unsafe { c::bind(*sock.as_inner(), addrp, len as _) })?;
343343

344344
// Start listening
345345
cvt(unsafe { c::listen(*sock.as_inner(), 128) })?;
@@ -430,7 +430,7 @@ impl UdpSocket {
430430

431431
let sock = Socket::new(addr, c::SOCK_DGRAM)?;
432432
let (addrp, len) = addr.into_inner();
433-
cvt(unsafe { c::bind(*sock.as_inner(), addrp, len) })?;
433+
cvt(unsafe { c::bind(*sock.as_inner(), addrp, len as _) })?;
434434
Ok(UdpSocket { inner: sock })
435435
}
436436

0 commit comments

Comments
 (0)