rollup merge of #17020 : nodakai/libnative-c_int

diff --combined src/libnative/io/net.rs
index 1a7a8da391a4a3a01a39be5e1e3f0b1ba7f6f054,5820323e14bfc586a7f5ada5931ef89d30d34cf0..ba951cdef26b92272ffd13449660e5470f805b4e
--- 1/src/libnative/io/net.rs
--- 2/src/libnative/io/net.rs
+++ b/src/libnative/io/net.rs
@@@ -13,8 -13,7 +13,7 @@@ use libc
  use std::mem;
  use std::ptr;
  use std::rt::mutex;
- use std::rt::rtio;
- use std::rt::rtio::{IoResult, IoError};
+ use std::rt::rtio::{mod, IoResult, IoError};
  use std::sync::atomic;
  
  use super::{retry, keep_going};
@@@ -959,7 -958,7 +958,7 @@@ pub fn read<T>(fd: sock_t
              // wait for the socket to become readable again.
              let _guard = lock();
              match retry(|| read(deadline.is_some())) {
 -                -1 if util::wouldblock() => { assert!(deadline.is_some()); }
 +                -1 if util::wouldblock() => {}
                  -1 => return Err(os::last_error()),
                 n => { ret = n; break }
              }
@@@ -988,9 -987,7 +987,7 @@@ pub fn write<T>(fd: sock_t
                  write(false, inner, len)
              });
          } else {
-             ret = retry(|| {
-                 write(false, buf.as_ptr(), buf.len()) as libc::c_int
-             }) as i64;
+             ret = retry(|| { write(false, buf.as_ptr(), buf.len()) });
              if ret > 0 { written = ret as uint; }
          }
      }
@@@ -1017,7 -1014,7 +1014,7 @@@
              let _guard = lock();
              let ptr = buf.slice_from(written).as_ptr();
              let len = buf.len() - written;
-             match retry(|| write(deadline.is_some(), ptr, len) as libc::c_int) {
+             match retry(|| write(deadline.is_some(), ptr, len)) {
                  -1 if util::wouldblock() => {}
                  -1 => return Err(os::last_error()),
                  n => { written += n as uint; }