---

yaml
---
r: 113897
b: refs/heads/master
c: 295e0a0
h: refs/heads/master
i:
  113895: cfbe171
v: v3

Author: alexcrichton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: e27f27c8588f5cfa0cd9dfbbdf7609ea2d6818ec
+refs/heads/master: 295e0a04ad57c001e854c5f52cecc18335113544
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: ec0258a381b88b5574e3f8ce72ae553ac3a574b7
 refs/heads/try: 7c6c492fb2af9a85f21ff952942df3523b22fd17

trunk/src/libnative/io/c_unix.rs

@@ -27,6 +27,13 @@ pub static FIOCLEX: libc::c_ulong = 0x20006601;
 #[cfg(target_os = "android")]
 pub static FIOCLEX: libc::c_ulong = 0x5451;
 
+#[cfg(target_os = "macos")]
+#[cfg(target_os = "freebsd")]
+pub static MSG_DONTWAIT: libc::c_int = 0x80;
+#[cfg(target_os = "linux")]
+#[cfg(target_os = "android")]
+pub static MSG_DONTWAIT: libc::c_int = 0x40;
+
 extern {
     pub fn gettimeofday(timeval: *mut libc::timeval,
                         tzp: *libc::c_void) -> libc::c_int;

trunk/src/libnative/io/c_win32.rs

@@ -18,6 +18,7 @@ pub static WSADESCRIPTION_LEN: uint = 256;
 pub static WSASYS_STATUS_LEN: uint = 128;
 pub static FIONBIO: libc::c_long = 0x8004667e;
 static FD_SETSIZE: uint = 64;
+pub static MSG_DONTWAIT: libc::c_int = 0;
 
 pub struct WSADATA {
     pub wVersion: libc::WORD,

trunk/src/libnative/io/file_unix.rs

@@ -189,6 +189,9 @@ impl rtio::RtioPipe for FileDesc {
     fn close_write(&mut self) -> Result<(), IoError> {
         Err(io::standard_error(io::InvalidInput))
     }
+    fn set_timeout(&mut self, _t: Option<u64>) {}
+    fn set_read_timeout(&mut self, _t: Option<u64>) {}
+    fn set_write_timeout(&mut self, _t: Option<u64>) {}
 }
 
 impl rtio::RtioTTY for FileDesc {

trunk/src/libnative/io/file_win32.rs

@@ -221,6 +221,9 @@ impl rtio::RtioPipe for FileDesc {
     fn close_write(&mut self) -> IoResult<()> {
         Err(io::standard_error(io::InvalidInput))
     }
+    fn set_timeout(&mut self, _t: Option<u64>) {}
+    fn set_read_timeout(&mut self, _t: Option<u64>) {}
+    fn set_write_timeout(&mut self, _t: Option<u64>) {}
 }
 
 impl rtio::RtioTTY for FileDesc {