diff options
| author | mgiuca@chromium.org <mgiuca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-06 04:17:53 +0000 |
|---|---|---|
| committer | mgiuca@chromium.org <mgiuca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-06 04:17:53 +0000 |
| commit | 27f62d43929d33f178e89a832fde0b091a452fdd (patch) | |
| tree | 070e83f2e47c41af90d12e213e204f81b600e9d5 /net/proxy/proxy_config_service_linux.cc | |
| parent | b478dcdac0456abef819efc754c0d22c4fffe284 (diff) | |
| download | chromium_src-27f62d43929d33f178e89a832fde0b091a452fdd.zip chromium_src-27f62d43929d33f178e89a832fde0b091a452fdd.tar.gz chromium_src-27f62d43929d33f178e89a832fde0b091a452fdd.tar.bz2 | |
Fixed Linux build with glib 2.40 (Ubuntu 14.04).
In proxy_config_service_linux, disabled glib deprecation warnings. The
function g_settings_list_schemas got deprecated in 2.40, but its
replacement is not available in older glib versions (such as the one the
build bots currently use, 2.32), so for now, disable the warnings.
BUG=351911
Review URL: https://codereview.chromium.org/264963005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268417 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_config_service_linux.cc')
| -rw-r--r-- | net/proxy/proxy_config_service_linux.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc index a93567d..0e65b72 100644 --- a/net/proxy/proxy_config_service_linux.cc +++ b/net/proxy/proxy_config_service_linux.cc @@ -4,6 +4,15 @@ #include "net/proxy/proxy_config_service_linux.h" +// glib >=2.40 deprecate g_settings_list_schemas in favor of +// g_settings_schema_source_list_schemas. This function is not available on +// earlier versions that we still need to support (specifically, 2.32), so +// disable the warning. +// TODO(mgiuca): Remove this suppression when we drop support for Ubuntu 13.10 +// (saucy) and earlier. Update the code to use +// g_settings_schema_source_list_schemas instead. +#define GLIB_DISABLE_DEPRECATION_WARNINGS + #include <errno.h> #include <fcntl.h> #if defined(USE_GCONF) @@ -39,9 +48,6 @@ #include "url/url_canon.h" #if defined(USE_GIO) -#if __clang__ -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#endif #include "library_loaders/libgio.h" #endif // defined(USE_GIO) |