diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-05-07 23:39:56 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-05-07 23:58:55 -0700 |
| commit | 418f197351fbc570a0e7bbf93d509cd44f988467 (patch) | |
| tree | 3b2e197847d3cb44de1f4b456db3cbd84f04f86b /src/libnative | |
| parent | 8e9530218124a277ae1febbc338c4de6f88711dd (diff) | |
| download | rust-418f197351fbc570a0e7bbf93d509cd44f988467.tar.gz rust-418f197351fbc570a0e7bbf93d509cd44f988467.zip | |
Test fixes and rebase conflicts
Diffstat (limited to 'src/libnative')
| -rw-r--r-- | src/libnative/io/pipe_unix.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libnative/io/pipe_unix.rs b/src/libnative/io/pipe_unix.rs index 966c711525b..36ae2ba06d5 100644 --- a/src/libnative/io/pipe_unix.rs +++ b/src/libnative/io/pipe_unix.rs @@ -168,7 +168,7 @@ impl rtio::RtioPipe for UnixStream { libc::send(fd, buf as *mut libc::c_void, len as libc::size_t, - flags) + flags) as i64 }; match net::write(fd, self.write_deadline, buf, true, dolock, dowrite) { Ok(_) => Ok(()), |