diff options
author | Moonchild <moonchild@palemoon.org> | 2020-05-19 14:21:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-19 14:21:00 +0200 |
commit | ffb32138cbe23dc275ec409770246739f9678cef (patch) | |
tree | 3ffdf70469a762ad18861913690cdaf37be90a16 /netwerk/dns | |
parent | 3da22ea943f6e7840558ddd1e4b473bef5837873 (diff) | |
parent | 41757ae2c034a3bc549cba88e99d55ea2db7ca12 (diff) | |
download | UXP-ffb32138cbe23dc275ec409770246739f9678cef.tar UXP-ffb32138cbe23dc275ec409770246739f9678cef.tar.gz UXP-ffb32138cbe23dc275ec409770246739f9678cef.tar.lz UXP-ffb32138cbe23dc275ec409770246739f9678cef.tar.xz UXP-ffb32138cbe23dc275ec409770246739f9678cef.zip |
Merge pull request #1554 from MoonchildProductions/deunify_netwerk
Deunify netwerk
Diffstat (limited to 'netwerk/dns')
-rw-r--r-- | netwerk/dns/mdns/libmdns/moz.build | 4 | ||||
-rw-r--r-- | netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.h | 1 | ||||
-rw-r--r-- | netwerk/dns/moz.build | 7 |
3 files changed, 5 insertions, 7 deletions
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/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" 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', ] |