Skip to content

Commit ac716df

Browse files
committed
chromium: Forward port musl patches
Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 parent 7ff22c9 commit ac716df

File tree

1 file changed

+14
-16
lines changed

1 file changed

+14
-16
lines changed

meta-chromium/recipes-browser/chromium/files/musl/0009-provide-res_ninit-and-nclose-APIs-on-non-glibc-linux.patch

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,36 +10,34 @@ Upstream-Status: Pending
1010
Signed-off-by: Khem Raj <raj.khem@gmail.com>
1111
--- a/net/dns/dns_config_service_linux.cc
1212
+++ b/net/dns/dns_config_service_linux.cc
13-
@@ -414,12 +414,6 @@ class DnsConfigServiceLinux::ConfigReade
14-
base::ScopedBlockingCall scoped_blocking_call(
15-
FROM_HERE, base::BlockingType::MAY_BLOCK);
13+
@@ -443,12 +443,6 @@ class DnsConfigServiceLinux::ConfigReade
14+
base::ScopedBlockingCall scoped_blocking_call(
15+
FROM_HERE, base::BlockingType::MAY_BLOCK);
1616

17-
- std::unique_ptr<struct __res_state> res = resolv_reader_->GetResState();
18-
- if (res) {
19-
- dns_config_ = ConvertResStateToDnsConfig(*res.get());
20-
- resolv_reader_->CloseResState(res.get());
21-
- }
17+
- std::unique_ptr<struct __res_state> res = resolv_reader_->GetResState();
18+
- if (res) {
19+
- dns_config_ = ConvertResStateToDnsConfig(*res.get());
20+
- resolv_reader_->CloseResState(res.get());
21+
- }
2222
-
23-
UMA_HISTOGRAM_BOOLEAN("Net.DNS.DnsConfig.Resolv.Read",
24-
dns_config_.has_value());
25-
if (!dns_config_.has_value())
23+
UMA_HISTOGRAM_BOOLEAN("Net.DNS.DnsConfig.Resolv.Read",
24+
dns_config_.has_value());
25+
if (!dns_config_.has_value())
2626
--- a/net/dns/dns_reloader.cc
2727
+++ b/net/dns/dns_reloader.cc
28-
@@ -4,9 +4,8 @@
28+
@@ -4,8 +4,7 @@
2929

3030
#include "net/dns/dns_reloader.h"
3131

3232
-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
3333
- !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
34-
-
3534
+#if defined(__GLIBC__)
36-
+
35+
3736
#include <resolv.h>
3837

39-
#include "base/lazy_instance.h"
4038
--- a/net/dns/host_resolver_manager.cc
4139
+++ b/net/dns/host_resolver_manager.cc
42-
@@ -2902,8 +2902,7 @@ HostResolverManager::HostResolverManager
40+
@@ -2906,8 +2906,7 @@ HostResolverManager::HostResolverManager
4341
NetworkChangeNotifier::AddConnectionTypeObserver(this);
4442
if (system_dns_config_notifier_)
4543
system_dns_config_notifier_->AddObserver(this);

0 commit comments

Comments
 (0)