diff options
| -rw-r--r-- | src/fcntl.rs | 1 | ||||
| -rw-r--r-- | src/sys/event.rs | 2 | ||||
| -rw-r--r-- | src/sys/socket.rs | 8 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/fcntl.rs b/src/fcntl.rs index 902ebe64..de1b84c7 100644 --- a/src/fcntl.rs +++ b/src/fcntl.rs @@ -8,6 +8,7 @@ pub use self::ffi::flock; pub type Fd = c_int; +#[allow(dead_code)] mod ffi { pub use libc::{open, fcntl}; pub use self::os::*; diff --git a/src/sys/event.rs b/src/sys/event.rs index 8672cbfd..3fcbe0ad 100644 --- a/src/sys/event.rs +++ b/src/sys/event.rs @@ -18,6 +18,8 @@ mod ffi { pub udata: u64 // 8 } + // Bug in rustc, cannot determine that kevent is #[repr(C)] + #[allow(ctypes)] extern { pub fn kqueue() -> c_int; diff --git a/src/sys/socket.rs b/src/sys/socket.rs index 0f4b2874..4956b59b 100644 --- a/src/sys/socket.rs +++ b/src/sys/socket.rs @@ -207,7 +207,7 @@ pub fn bind(sockfd: Fd, addr: &SockAddr) -> SysResult<()> { } pub fn accept(sockfd: Fd) -> SysResult<Fd> { - let res = unsafe { ffi::accept(sockfd, ptr::mut_null(), ptr::mut_null()) }; + let res = unsafe { ffi::accept(sockfd, ptr::null_mut(), ptr::null_mut()) }; if res < 0 { return Err(SysError::last()); @@ -232,10 +232,10 @@ pub fn accept4(sockfd: Fd, flags: SockFlag) -> SysResult<Fd> { let res = if feat_atomic { unsafe { mem::transmute::<*const (), F>(accept4)( - sockfd, ptr::mut_null(), ptr::mut_null(), flags.bits) + sockfd, ptr::null_mut(), ptr::null_mut(), flags.bits) } } else { - unsafe { ffi::accept(sockfd, ptr::mut_null(), ptr::mut_null()) } + unsafe { ffi::accept(sockfd, ptr::null_mut(), ptr::null_mut()) } }; if res < 0 { @@ -258,7 +258,7 @@ pub fn accept4(sockfd: Fd, flags: SockFlag) -> SysResult<Fd> { #[cfg(target_os = "macos")] #[cfg(target_os = "ios")] pub fn accept4(sockfd: Fd, flags: SockFlag) -> SysResult<Fd> { - let res = unsafe { ffi::accept(sockfd, ptr::mut_null(), ptr::mut_null()) }; + let res = unsafe { ffi::accept(sockfd, ptr::null_mut(), ptr::null_mut()) }; if res < 0 { return Err(SysError::last()); |