Merge branch 'fix-tiocgwinsz-dragonfly' into 'master'

Fix TIOCGWINSZ type mismatch on DragonFly

See merge request redox-os/termion!152
This commit is contained in:
Jeremy Soller 2018-12-29 13:55:12 +00:00
commit c04fd9dce9
1 changed files with 1 additions and 1 deletions

View File

@ -14,7 +14,7 @@ struct TermSize {
pub fn terminal_size() -> io::Result<(u16, u16)> { pub fn terminal_size() -> io::Result<(u16, u16)> {
unsafe { unsafe {
let mut size: TermSize = mem::zeroed(); let mut size: TermSize = mem::zeroed();
cvt(ioctl(STDOUT_FILENO, TIOCGWINSZ, &mut size as *mut _))?; cvt(ioctl(STDOUT_FILENO, TIOCGWINSZ.into(), &mut size as *mut _))?;
Ok((size.col as u16, size.row as u16)) Ok((size.col as u16, size.row as u16))
} }
} }