Merge pull request #13 from gchers/master

Fix ioctl() call compilation error for freebsd
murarth · Sep 6, 2017 · ee314dc · ee314dc
2 parents 731725f + 28ed48a
commit ee314dc
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/unix/terminal.rs b/src/unix/terminal.rs
@@ -395,7 +395,10 @@ struct Winsize {
 fn get_winsize(fd: c_int) -> io::Result<Winsize> {
     let mut winsz: Winsize = unsafe { zeroed() };
 
-    let res = unsafe { ioctl(fd, TIOCGWINSZ, &mut winsz) };
+    // NOTE: this ".into()" is added as a temporary fix to a libc
+    // bug described in:
+    //  https://github.com/rust-lang/libc/pull/704
+    let res = unsafe { ioctl(fd, TIOCGWINSZ.into(), &mut winsz) };
 
     if res == -1 {
         Err(io::Error::last_os_error())