Skip to content
Snippets Groups Projects
Commit ebb389c1 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame :jack_o_lantern: Committed by Richard Pospesel
Browse files

fixup! Bug 41599: Always return an empty string as network ID

Bug 41647: Clean up our {TOR,BASE}_BROWSER(_VERSION)? macros

Changed BASE_BROWSER with BASE_BROWSER_VERSION.
parent 38a620cf
No related branches found
No related tags found
1 merge request!580Rebase Tor Browser Alpha to 102.9.0esr
......@@ -123,7 +123,7 @@ nsAndroidNetworkLinkService::GetLinkType(uint32_t* aLinkType) {
NS_IMETHODIMP
nsAndroidNetworkLinkService::GetNetworkID(nsACString& aNetworkID) {
#ifdef BASE_BROWSER
#ifdef BASE_BROWSER_VERSION
aNetworkID.Truncate();
#else
if (!mNetlinkSvc) {
......
......@@ -50,7 +50,7 @@ nsNetworkLinkService::GetLinkType(uint32_t* aLinkType) {
NS_IMETHODIMP
nsNetworkLinkService::GetNetworkID(nsACString& aNetworkID) {
#ifdef BASE_BROWSER
#ifdef BASE_BROWSER_VERSION
aNetworkID.Truncate();
#else
if (!mNetlinkSvc) {
......
......@@ -123,7 +123,7 @@ nsNetworkLinkService::GetLinkType(uint32_t* aLinkType) {
NS_IMETHODIMP
nsNetworkLinkService::GetNetworkID(nsACString& aNetworkID) {
#ifdef BASE_BROWSER
#ifdef BASE_BROWSER_VERSION
aNetworkID.Truncate();
#else
MutexAutoLock lock(mMutex);
......
......@@ -1875,7 +1875,7 @@ void NetlinkService::CalculateNetworkID() {
}
void NetlinkService::GetNetworkID(nsACString& aNetworkID) {
#ifdef BASE_BROWSER
#ifdef BASE_BROWSER_VERSION
aNetworkID.Truncate();
#else
MutexAutoLock lock(mMutex);
......
......@@ -105,7 +105,7 @@ nsNotifyAddrListener::GetLinkType(uint32_t* aLinkType) {
NS_IMETHODIMP
nsNotifyAddrListener::GetNetworkID(nsACString& aNetworkID) {
#ifdef BASE_BROWSER
#ifdef BASE_BROWSER_VERSION
aNetworkID.Truncate();
#else
MutexAutoLock lock(mMutex);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment