From 49d8fd33e026ad6e2c055d05d6667180ba2af7be Mon Sep 17 00:00:00 2001 From: Thomas de Zeeuw Date: Thu, 24 Dec 2020 16:00:21 +0100 Subject: [PATCH] Fix complication on Android With the net feature enabled, but with os-poll disabled. --- src/sys/shell/tcp.rs | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/sys/shell/tcp.rs b/src/sys/shell/tcp.rs index 2017bda30..a2baaa622 100644 --- a/src/sys/shell/tcp.rs +++ b/src/sys/shell/tcp.rs @@ -1,7 +1,7 @@ +use crate::net::TcpKeepalive; use std::io; use std::net::{self, SocketAddr}; use std::time::Duration; -use crate::net::TcpKeepalive; pub(crate) type TcpSocket = i32; @@ -79,19 +79,12 @@ pub(crate) fn get_keepalive(_: TcpSocket) -> io::Result { os_required!(); } -#[cfg(any( - target_os = "linux", - target_os = "macos", - target_os = "ios", - target_os = "freebsd", - target_os = "netbsd", - target_os = "windows", -))] pub(crate) fn set_keepalive_params(_: TcpSocket, _: TcpKeepalive) -> io::Result<()> { os_required!() } #[cfg(any( + target_os = "android", target_os = "linux", target_os = "macos", target_os = "ios",