diff options
| author | Carl Lerche <me@carllerche.com> | 2014-09-22 00:18:33 -0700 |
|---|---|---|
| committer | Carl Lerche <me@carllerche.com> | 2014-09-22 00:18:33 -0700 |
| commit | e8b9636ba475356cd8e2408d6d991af7a766c22f (patch) | |
| tree | f845693d4f5deaf500102e599f536f6261d7996b | |
| parent | a4ce09b497cee146a6dd2cc8ff115ae1a43c838a (diff) | |
| parent | 1f5dbb83ddc981820cdc50180705cb142e10e40a (diff) | |
| download | nix-e8b9636ba475356cd8e2408d6d991af7a766c22f.zip | |
Merge remote-tracking branch 'cgaebel/master'
| -rw-r--r-- | src/fcntl.rs | 1 | ||||
| -rw-r--r-- | src/sys/event.rs | 6 | ||||
| -rw-r--r-- | src/sys/socket.rs | 8 |
3 files changed, 9 insertions, 6 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..ae57cec9 100644 --- a/src/sys/event.rs +++ b/src/sys/event.rs @@ -15,9 +15,11 @@ mod ffi { pub flags: EventFlag, // 2 pub fflags: FilterFlag, // 4 pub data: intptr_t, // 8 - pub udata: u64 // 8 + pub udata: uint // 8 } + // Bug in rustc, cannot determine that kevent is #[repr(C)] + #[allow(ctypes)] extern { pub fn kqueue() -> c_int; @@ -161,7 +163,7 @@ pub fn ev_set(ev: &mut KEvent, filter: EventFilter, flags: EventFlag, fflags: FilterFlag, - udata: u64) { + udata: uint) { ev.ident = ident as u64; ev.filter = filter; 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()); |