Skip to content

Commit

Permalink
Merge #1483
Browse files Browse the repository at this point in the history
1483: Remove some actually unsupported termios iflags on redox r=asomers a=coolreader18

Related to rust-lang/libc#2327


Co-authored-by: Noah <33094578+coolreader18@users.noreply.github.com>
  • Loading branch information
bors[bot] and coolreader18 committed Aug 9, 2021
2 parents ba42d04 + 74ccbf4 commit 4c4be11
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Expand Up @@ -49,6 +49,10 @@ This project adheres to [Semantic Versioning](https://semver.org/).

### Removed

- Removed a couple of termios constants on redox that were never actually
supported.
(#[1483](https://github.com/nix-rust/nix/pull/1483))

## [0.22.0] - 9 July 2021
### Added
- Added `if_nameindex` (#[1445](https://github.com/nix-rust/nix/pull/1445))
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Expand Up @@ -25,7 +25,7 @@ targets = [
]

[dependencies]
libc = { git = "https://github.com/rust-lang/libc", rev = "9c1489fa8", features = [ "extra_traits" ] }
libc = { git = "https://github.com/rust-lang/libc", rev = "f5e31f208", features = [ "extra_traits" ] }
bitflags = "1.1"
cfg-if = "1.0"

Expand Down
2 changes: 2 additions & 0 deletions src/sys/termios.rs
Expand Up @@ -604,7 +604,9 @@ libc_bitflags! {
ICRNL;
IXON;
IXOFF;
#[cfg(not(target_os = "redox"))]
IXANY;
#[cfg(not(target_os = "redox"))]
IMAXBEL;
#[cfg(any(target_os = "android", target_os = "linux", target_os = "macos"))]
IUTF8;
Expand Down

0 comments on commit 4c4be11

Please sign in to comment.