Work around bugs in 32-bit enum FFI

cc #10308

3 files changed, 12 insertions, 2 deletions

diff --git a/src/librustuv/tty.rs b/src/librustuv/tty.rs
index b1bc378e617..e224806cec1 100644
--- a/src/librustuv/tty.rs
+++ b/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 }
     }
 }
 
diff --git a/src/librustuv/uvll.rs b/src/librustuv/uvll.rs
index 09a1f8f37bd..d009201e840 100644
--- a/src/librustuv/uvll.rs
+++ b/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)
diff --git a/src/rt/rust_uv.cpp b/src/rt/rust_uv.cpp
index 2745c6062e6..6f619431ad7 100644
--- a/src/rt/rust_uv.cpp
+++ b/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);
+}