diff options
Diffstat (limited to 'www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc')
| -rw-r--r-- | www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc index 03b4e20201aa..16707212dda0 100644 --- a/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc +++ b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc @@ -1,24 +1,24 @@ ---- net/proxy_resolution/proxy_config_service_linux.cc.orig 2022-07-22 17:30:31 UTC +--- net/proxy_resolution/proxy_config_service_linux.cc.orig 2024-02-23 21:04:38 UTC +++ net/proxy_resolution/proxy_config_service_linux.cc @@ -6,7 +6,9 @@ #include <errno.h> #include <limits.h> -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) #include <sys/inotify.h> +#endif #include <unistd.h> #include <map> -@@ -500,6 +502,7 @@ bool SettingGetterImplGSettings::CheckVersion( +@@ -505,6 +507,7 @@ bool SettingGetterImplGSettings::CheckVersion( } #endif // defined(USE_GIO) -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) // Converts |value| from a decimal string to an int. If there was a failure // parsing, returns |default_value|. int StringToIntOrDefault(base::StringPiece value, int default_value) { -@@ -1028,6 +1031,7 @@ class SettingGetterImplKDE : public ProxyConfigService +@@ -1033,6 +1036,7 @@ class SettingGetterImplKDE : public ProxyConfigService // events on. scoped_refptr<base::SequencedTaskRunner> file_task_runner_; }; @@ -26,15 +26,15 @@ } // namespace -@@ -1245,9 +1249,11 @@ ProxyConfigServiceLinux::Delegate::Delegate( - case base::nix::DESKTOP_ENVIRONMENT_KDE3: +@@ -1251,9 +1255,11 @@ ProxyConfigServiceLinux::Delegate::Delegate( case base::nix::DESKTOP_ENVIRONMENT_KDE4: case base::nix::DESKTOP_ENVIRONMENT_KDE5: -+#if !defined(OS_BSD) + case base::nix::DESKTOP_ENVIRONMENT_KDE6: ++#if !BUILDFLAG(IS_BSD) setting_getter_ = std::make_unique<SettingGetterImplKDE>(env_var_getter_.get()); break; +#endif case base::nix::DESKTOP_ENVIRONMENT_XFCE: + case base::nix::DESKTOP_ENVIRONMENT_LXQT: case base::nix::DESKTOP_ENVIRONMENT_OTHER: - break; |