Skip to content

Commit 74fe838

Browse files
authored
Merge pull request #50 from coolreader18/dedup-redox
Deduplicate sys::redox with sys::unix, as redox is a unix OS
2 parents 3b0b901 + 1996c47 commit 74fe838

File tree

4 files changed

+10
-835
lines changed

4 files changed

+10
-835
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ features = ["handleapi", "ws2def", "ws2ipdef", "ws2tcpip", "minwindef"]
2121

2222
[target."cfg(any(unix, target_os = \"redox\"))".dependencies]
2323
cfg-if = "0.1.6"
24-
libc = "0.2.42"
24+
libc = "0.2"
2525

2626
[target."cfg(target_os = \"redox\")".dependencies]
2727
redox_syscall = "0.1.38"

src/lib.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@ mod sys;
5656
#[cfg(windows)]
5757
#[path = "sys/windows.rs"]
5858
mod sys;
59-
#[cfg(target_os = "redox")]
60-
#[path = "sys/redox/mod.rs"]
61-
mod sys;
6259

6360
/// Newtype, owned, wrapper around a system socket.
6461
///
@@ -136,7 +133,6 @@ fn hton<I: NetInt>(i: I) -> I {
136133
i.to_be()
137134
}
138135

139-
#[cfg(not(target_os = "redox"))]
140136
fn ntoh<I: NetInt>(i: I) -> I {
141137
I::from_be(i)
142138
}

0 commit comments

Comments
 (0)