about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-09-14 05:00:56 -0700
committerbors <bors@rust-lang.org>2013-09-14 05:00:56 -0700
commit55b43fa26e02d1f7cf96a8d1ab172fbfd34050bd (patch)
tree8ed5cbf115e16ddfddeaba40c117b61816ec47f1 /src/libstd
parent3d469c25e5ecf8dbacb59f714bafd9a92d676852 (diff)
parent3924cb031f0cf476f0a1a85ee21598ec2e60d9fd (diff)
downloadrust-55b43fa26e02d1f7cf96a8d1ab172fbfd34050bd.tar.gz
rust-55b43fa26e02d1f7cf96a8d1ab172fbfd34050bd.zip
auto merge of #9165 : klutzy/rust/newrt-file-fix, r=sanxiyn
It was broken on win32 because of header inconsistency.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/rt/uv/uvll.rs9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/libstd/rt/uv/uvll.rs b/src/libstd/rt/uv/uvll.rs
index 4ef97677bd3..5bf04110abf 100644
--- a/src/libstd/rt/uv/uvll.rs
+++ b/src/libstd/rt/uv/uvll.rs
@@ -67,11 +67,20 @@ pub mod errors {
     pub static EPIPE: c_int = -libc::EPIPE;
 }
 
+// see libuv/include/uv-unix.h
+#[cfg(unix)]
 pub struct uv_buf_t {
     base: *u8,
     len: libc::size_t,
 }
 
+// see libuv/include/uv-win.h
+#[cfg(windows)]
+pub struct uv_buf_t {
+    len: u32,
+    base: *u8,
+}
+
 pub type uv_handle_t = c_void;
 pub type uv_loop_t = c_void;
 pub type uv_idle_t = c_void;