From 418f197351fbc570a0e7bbf93d509cd44f988467 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 7 May 2014 23:39:56 -0700
Subject: Test fixes and rebase conflicts

---
 src/libnative/io/pipe_unix.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/libnative')

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(()),
-- 
cgit 1.4.1-3-g733a5