Merge remote-tracking branch 'cgaebel/master'

Author: carllerche

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::*;

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;

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());