summaryrefslogtreecommitdiffstats
path: root/netwerk/base/nsSocketTransport2.cpp
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-02-22 20:10:23 -0500
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-14 12:52:18 +0200
commit92edec6f587ae6b86c9b27947113997972ce0c1a (patch)
tree246706f86a7e5e3e086cf9ac83f7bdcec0055cee /netwerk/base/nsSocketTransport2.cpp
parent2dea4edfd7cf9a760149da220e60dddb2b0b0d09 (diff)
downloadUXP-92edec6f587ae6b86c9b27947113997972ce0c1a.tar
UXP-92edec6f587ae6b86c9b27947113997972ce0c1a.tar.gz
UXP-92edec6f587ae6b86c9b27947113997972ce0c1a.tar.lz
UXP-92edec6f587ae6b86c9b27947113997972ce0c1a.tar.xz
UXP-92edec6f587ae6b86c9b27947113997972ce0c1a.zip
Issue #1053 - Remove android support from netwerk
Diffstat (limited to 'netwerk/base/nsSocketTransport2.cpp')
-rw-r--r--netwerk/base/nsSocketTransport2.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/netwerk/base/nsSocketTransport2.cpp b/netwerk/base/nsSocketTransport2.cpp
index 0c8434813..76a357aa3 100644
--- a/netwerk/base/nsSocketTransport2.cpp
+++ b/netwerk/base/nsSocketTransport2.cpp
@@ -3048,9 +3048,8 @@ nsSocketTransport::PRFileDescAutoLock::SetKeepaliveVals(bool aEnabled,
#elif defined(XP_UNIX)
// Not all *nix OSes support the following setsockopt() options
- // ... but we assume they are supported in the Android kernel;
// build errors will tell us if they are not.
-#if defined(ANDROID) || defined(TCP_KEEPIDLE)
+#ifdef TCP_KEEPIDLE
// Idle time until first keepalive probe; interval between ack'd probes; seconds.
int err = setsockopt(sock, IPPROTO_TCP, TCP_KEEPIDLE,
&aIdleTime, sizeof(aIdleTime));
@@ -3061,7 +3060,7 @@ nsSocketTransport::PRFileDescAutoLock::SetKeepaliveVals(bool aEnabled,
}
#endif
-#if defined(ANDROID) || defined(TCP_KEEPINTVL)
+#ifdef TCP_KEEPINTVL
// Interval between unack'd keepalive probes; seconds.
err = setsockopt(sock, IPPROTO_TCP, TCP_KEEPINTVL,
&aRetryInterval, sizeof(aRetryInterval));
@@ -3072,7 +3071,7 @@ nsSocketTransport::PRFileDescAutoLock::SetKeepaliveVals(bool aEnabled,
}
#endif
-#if defined(ANDROID) || defined(TCP_KEEPCNT)
+#ifdef TCP_KEEPCNT
// Number of unack'd keepalive probes before connection times out.
err = setsockopt(sock, IPPROTO_TCP, TCP_KEEPCNT,
&aProbeCount, sizeof(aProbeCount));