From 364e44a4aa3de7493b20b568237ed5bad0d5f111 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Sun, 17 May 2020 15:41:22 +0000
Subject: Issue #80 - De-unify netwerk/dns

---
 netwerk/dns/mdns/libmdns/moz.build | 4 ++--
 netwerk/dns/moz.build              | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'netwerk/dns')

diff --git a/netwerk/dns/mdns/libmdns/moz.build b/netwerk/dns/mdns/libmdns/moz.build
index b7d376fc3..feab013ff 100644
--- a/netwerk/dns/mdns/libmdns/moz.build
+++ b/netwerk/dns/mdns/libmdns/moz.build
@@ -5,7 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'MDNSResponderOperator.cpp',
         'MDNSResponderReply.cpp',
         'nsDNSServiceDiscovery.cpp',
@@ -31,7 +31,7 @@ else:
         'fallback/MulticastDNS.jsm',
     ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsDNSServiceInfo.cpp',
     'nsMulticastDNSModule.cpp',
 ]
diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build
index c3b84df2f..437f69bc5 100644
--- a/netwerk/dns/moz.build
+++ b/netwerk/dns/moz.build
@@ -29,11 +29,6 @@ EXPORTS.mozilla.net += [
 ]
 
 SOURCES += [
-    'nsEffectiveTLDService.cpp', # Excluded from UNIFIED_SOURCES due to special build flags.
-    'nsHostResolver.cpp', # Redefines LOG
-]
-
-UNIFIED_SOURCES += [
     'ChildDNSService.cpp',
     'DNS.cpp',
     'DNSListenerProxy.cpp',
@@ -41,6 +36,8 @@ UNIFIED_SOURCES += [
     'DNSRequestParent.cpp',
     'GetAddrInfo.cpp',
     'nsDNSService2.cpp',
+    'nsEffectiveTLDService.cpp',
+    'nsHostResolver.cpp',
     'nsIDNService.cpp',
     'punycode.c',
 ]
-- 
cgit v1.2.3


From 18c36ffcd45999de5ca028500038c7f1f945165a Mon Sep 17 00:00:00 2001
From: adeshkp <adeshkp@users.noreply.github.com>
Date: Mon, 18 May 2020 23:35:43 +0530
Subject: Issue #80 - Include MDNSResponderOperator.h in
 libmdns/nsDNSServiceDiscovery.h for Mac

This is needed for forward declaration of `BrowseOperator` and `RegisterOperator`.
---
 netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'netwerk/dns')

diff --git a/netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.h b/netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.h
index 9bf2c798a..abe98f357 100644
--- a/netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.h
+++ b/netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.h
@@ -6,6 +6,7 @@
 #ifndef mozilla_netwerk_dns_mdns_libmdns_nsDNSServiceDiscovery_h
 #define mozilla_netwerk_dns_mdns_libmdns_nsDNSServiceDiscovery_h
 
+#include "MDNSResponderOperator.h"
 #include "nsIDNSServiceDiscovery.h"
 #include "nsCOMPtr.h"
 #include "mozilla/RefPtr.h"
-- 
cgit v1.2.3