Skip to content

Commit 4c4be11

Browse files
Merge #1483
1483: Remove some actually unsupported termios iflags on redox r=asomers a=coolreader18 Related to rust-lang/libc#2327 Co-authored-by: Noah <[email protected]>
2 parents ba42d04 + 74ccbf4 commit 4c4be11

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ This project adheres to [Semantic Versioning](https://semver.org/).
4949

5050
### Removed
5151

52+
- Removed a couple of termios constants on redox that were never actually
53+
supported.
54+
(#[1483](https://github.com/nix-rust/nix/pull/1483))
55+
5256
## [0.22.0] - 9 July 2021
5357
### Added
5458
- Added `if_nameindex` (#[1445](https://github.com/nix-rust/nix/pull/1445))

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ targets = [
2525
]
2626

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

src/sys/termios.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,9 @@ libc_bitflags! {
604604
ICRNL;
605605
IXON;
606606
IXOFF;
607+
#[cfg(not(target_os = "redox"))]
607608
IXANY;
609+
#[cfg(not(target_os = "redox"))]
608610
IMAXBEL;
609611
#[cfg(any(target_os = "android", target_os = "linux", target_os = "macos"))]
610612
IUTF8;

0 commit comments

Comments
 (0)