Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(345)

Unified Diff: net/proxy/proxy_config_service_linux.cc

Issue 264963005: Fixed Linux build with glib 2.40 (Ubuntu 14.04). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added TODO to remove the suppression when we drop support for Ubuntu 13.10. Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_config_service_linux.cc
diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc
index a93567d1e00de5e4f327496667aa2e4a53be5fbf..0e65b72c12acc4f561873b9e8a252ec6b7cbbd70 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)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698