---

yaml
---
r: 91608
b: refs/heads/auto
c: 0df8b00
h: refs/heads/master
v: v3

Author: alexcrichton

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 1bdaea827ed957ce404fffee27923e9606584ce0
+refs/heads/auto: 0df8b0057c8beaf108dfb34e53829b74fd2a7abc
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustuv/tty.rs

@@ -88,7 +88,7 @@ impl RtioTTY for TtyWatcher {
     }
 
     fn isatty(&self) -> bool {
-        unsafe { uvll::uv_guess_handle(self.fd) == uvll::UV_TTY }
+        unsafe { uvll::guess_handle(self.fd) == uvll::UV_TTY as libc::c_int }
     }
 }
 

branches/auto/src/librustuv/uvll.rs

@@ -671,6 +671,11 @@ pub unsafe fn populate_stat(req_in: *uv_fs_t, stat_out: *uv_stat_t) {
 
     rust_uv_populate_uv_stat(req_in, stat_out)
 }
+pub unsafe fn guess_handle(handle: c_int) -> c_int {
+    #[fixed_stack_segment]; #[inline(never)];
+
+    rust_uv_guess_handle(handle)
+}
 
 
 // uv_support is the result of compiling rust_uv.cpp
@@ -728,6 +733,7 @@ extern {
     fn rust_set_stdio_container_stream(c: *uv_stdio_container_t,
                                        stream: *uv_stream_t);
     fn rust_uv_process_pid(p: *uv_process_t) -> c_int;
+    fn rust_uv_guess_handle(fd: c_int) -> c_int;
 }
 
 // generic uv functions
@@ -861,7 +867,6 @@ externfn!(fn uv_tty_init(l: *uv_loop_t, tty: *uv_tty_t, fd: c_int,
 externfn!(fn uv_tty_set_mode(tty: *uv_tty_t, mode: c_int) -> c_int)
 externfn!(fn uv_tty_get_winsize(tty: *uv_tty_t, width: *c_int,
                                 height: *c_int) -> c_int)
-externfn!(fn uv_guess_handle(fd: c_int) -> uv_handle_type)
 
 // signals
 externfn!(fn uv_signal_init(loop_: *uv_loop_t, handle: *uv_signal_t) -> c_int)

branches/auto/src/rt/rust_uv.cpp

@@ -334,3 +334,8 @@ extern "C" int
 rust_uv_process_pid(uv_process_t* p) {
   return p->pid;
 }
+
+extern "C" int
+rust_uv_guess_handle(int fd) {
+  return uv_guess_handle(fd);
+}