Skip to content

Switched bsd speed_t def. to libc::speed_t #537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
posborne merged 1 commit into from
Feb 26, 2017
Merged

Switched bsd speed_t def. to libc::speed_t #537

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 5 additions & 13 deletions src/sys/termios.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,22 +96,14 @@ mod ffi {

#[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "dragonfly", target_os = "openbsd", target_os = "netbsd"))]
pub mod consts {
#[cfg(not(any(target_os = "dragonfly", target_os = "netbsd")))]
use libc::{c_int, c_ulong, c_uchar};
#[cfg(any(target_os = "dragonfly", target_os = "netbsd"))]
use libc::{c_int, c_uint, c_uchar};

#[cfg(not(any(target_os = "dragonfly", target_os = "netbsd")))]
pub type tcflag_t = c_ulong;
#[cfg(any(target_os = "dragonfly", target_os = "netbsd"))]
pub type tcflag_t = c_uint;
use libc;

pub type cc_t = c_uchar;
use libc::{c_int, c_uint, c_ulong, c_uchar};
Copy link
Member

@posborne posborne Feb 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These two lines can be combined with use libc::{self, ...} but doesn't really matter.


#[cfg(not(any(target_os = "dragonfly", target_os = "netbsd")))]
pub type speed_t = c_ulong;
#[cfg(any(target_os = "dragonfly", target_os = "netbsd"))]
pub type speed_t = c_uint;
pub type tcflag_t = libc::tcflag_t;
pub type cc_t = libc::cc_t;
pub type speed_t = libc::speed_t;

#[repr(C)]
#[derive(Clone, Copy)]
Expand Down