itsscb/tokio
1
0
Fork 0
mirror of https://github.com/tokio-rs/tokio.git synced 2025-10-01 12:20:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #237 from raphlinus/master

Browse Source 
[fuchsia] Config changes to build on Fuchsia
This commit is contained in:
Alex Crichton 2017-07-31 18:59:12 -05:00 committed by GitHub
commit fbd257f2bd
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -19,7 +19,7 @@ appveyor = { repository = "alexcrichton/tokio-core" }
[dependencies] [dependencies]
bytes = "0.4" bytes = "0.4"
log = "0.3" log = "0.3"
mio = "0.6.9" mio = "0.6.10"
scoped-tls = "0.1.0" scoped-tls = "0.1.0"
slab = "0.3" slab = "0.3"
iovec = "0.1" iovec = "0.1"

2
src/net/tcp.rs
View File

@ -706,7 +706,7 @@ impl Future for TcpStreamNewState {
} }
} }
#[cfg(unix)] #[cfg(all(unix, not(target_os = "fuchsia")))]
mod sys { mod sys {
use std::os::unix::prelude::*; use std::os::unix::prelude::*;
use super::{TcpStream, TcpListener}; use super::{TcpStream, TcpListener};

2
src/net/udp/mod.rs
View File

@ -415,7 +415,7 @@ impl<T> Future for RecvDgram<T>
} }
} }
#[cfg(unix)] #[cfg(all(unix, not(target_os = "fuchsia")))]
mod sys { mod sys {
use std::os::unix::prelude::*; use std::os::unix::prelude::*;
use super::UdpSocket; use super::UdpSocket;

4
src/reactor/mod.rs
View File

@ -820,7 +820,7 @@ fn usize2ready(bits: usize) -> mio::Ready {
ready | platform::usize2ready(bits) ready | platform::usize2ready(bits)
} }
#[cfg(unix)] #[cfg(all(unix, not(target_os = "fuchsia")))]
mod platform { mod platform {
use mio::Ready; use mio::Ready;
use mio::unix::UnixReady; use mio::unix::UnixReady;
@ -871,7 +871,7 @@ mod platform {
} }
} }
#[cfg(windows)] #[cfg(any(windows, target_os = "fuchsia"))]
mod platform { mod platform {
use mio::Ready; use mio::Ready;