diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-02-22 20:10:23 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2020-02-22 20:10:23 -0500 |
| commit | bdad2357a1f0d2aca7f1106f3195d1fd929dc1d1 (patch) | |
| tree | 2166aa86e8378b6973e9ebc95b748ad9c632abb1 /netwerk/base | |
| parent | 881c1e5f180c537b003b891dce7d7f114800ff3e (diff) | |
| download | UXP-bdad2357a1f0d2aca7f1106f3195d1fd929dc1d1.tar UXP-bdad2357a1f0d2aca7f1106f3195d1fd929dc1d1.tar.gz UXP-bdad2357a1f0d2aca7f1106f3195d1fd929dc1d1.tar.lz UXP-bdad2357a1f0d2aca7f1106f3195d1fd929dc1d1.tar.xz UXP-bdad2357a1f0d2aca7f1106f3195d1fd929dc1d1.zip | |
Issue #1053 - Remove android support from netwerk
Diffstat (limited to 'netwerk/base')
| -rw-r--r-- | netwerk/base/Tickler.h | 4 | ||||
| -rw-r--r-- | netwerk/base/nsNetUtil.cpp | 2 | ||||
| -rw-r--r-- | netwerk/base/nsSocketTransport2.cpp | 7 |
3 files changed, 3 insertions, 10 deletions
diff --git a/netwerk/base/Tickler.h b/netwerk/base/Tickler.h index 63353a924..e38f0d99c 100644 --- a/netwerk/base/Tickler.h +++ b/netwerk/base/Tickler.h @@ -27,10 +27,6 @@ // The tickler only applies to wifi on mobile right now. Hopefully it // can also be restricted to particular handset models in the future. -#if defined(ANDROID) -#define MOZ_USE_WIFI_TICKLER -#endif - #include "mozilla/Attributes.h" #include "nsISupports.h" #include <stdint.h> diff --git a/netwerk/base/nsNetUtil.cpp b/netwerk/base/nsNetUtil.cpp index 2974e26b0..ce0e2d4ef 100644 --- a/netwerk/base/nsNetUtil.cpp +++ b/netwerk/base/nsNetUtil.cpp @@ -1814,9 +1814,7 @@ NS_RelaxStrictFileOriginPolicy(nsIURI *aTargetURI, NS_FAILED(sourceFileURL->GetFile(getter_AddRefs(sourceFile))) || !targetFile || !sourceFile || NS_FAILED(targetFile->Normalize()) || -#ifndef MOZ_WIDGET_ANDROID NS_FAILED(sourceFile->Normalize()) || -#endif (!aAllowDirectoryTarget && (NS_FAILED(targetFile->IsDirectory(&targetIsDir)) || targetIsDir))) { return false; 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)); |