aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc')
-rw-r--r--www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc38
1 files changed, 1 insertions, 37 deletions
diff --git a/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc b/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc
index d2dc0e74e27d..bf12c27d0d25 100644
--- a/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc
+++ b/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc
@@ -1,4 +1,4 @@
---- net/dns/dns_config_service_posix_unittest.cc.orig 2020-05-13 18:39:46 UTC
+--- net/dns/dns_config_service_posix_unittest.cc.orig 2020-11-13 06:36:45 UTC
+++ net/dns/dns_config_service_posix_unittest.cc
@@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
@@ -9,39 +9,3 @@
#include <memory>
#include "base/cancelable_callback.h"
-@@ -51,7 +49,7 @@ const char* const kNameserversIPv4[] = {
- "1.0.0.1",
- };
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- const char* const kNameserversIPv6[] = {
- NULL,
- "2001:DB8:0::42",
-@@ -87,7 +85,7 @@ void InitializeResState(res_state res) {
- ++res->nscount;
- }
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // Install IPv6 addresses, replacing the corresponding IPv4 addresses.
- unsigned nscount6 = 0;
- for (unsigned i = 0; i < base::size(kNameserversIPv6) && i < MAXNS; ++i) {
-@@ -108,7 +106,7 @@ void InitializeResState(res_state res) {
- }
-
- void CloseResState(res_state res) {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- for (int i = 0; i < res->nscount; ++i) {
- if (res->_u._ext.nsaddrs[i] != NULL)
- free(res->_u._ext.nsaddrs[i]);
-@@ -133,7 +131,7 @@ void InitializeExpectedConfig(DnsConfig* config) {
- config->nameservers.push_back(IPEndPoint(ip, NS_DEFAULTPORT + i));
- }
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- for (unsigned i = 0; i < base::size(kNameserversIPv6) && i < MAXNS; ++i) {
- if (!kNameserversIPv6[i])
- continue;