Index: net/tools/net_watcher/net_watcher.cc |
diff --git a/net/tools/net_watcher/net_watcher.cc b/net/tools/net_watcher/net_watcher.cc |
index 426fea1781aadc4310ed350823e4df4ca7b2a8b0..479ed461277d1b41189ebe6ab51ab3e96336ed5d 100644 |
--- a/net/tools/net_watcher/net_watcher.cc |
+++ b/net/tools/net_watcher/net_watcher.cc |
@@ -127,6 +127,13 @@ class NetWatcher : |
} // namespace |
+// From glib version 2.36 onwards, g_type_init is implicitly called and it is |
+// deprecated. |
+#if (defined(OS_LINUX) || defined(OS_OPENBSD)) && !defined(OS_CHROMEOS) |
+#pragma GCC diagnostic push |
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations" |
+#endif |
+ |
int main(int argc, char* argv[]) { |
#if defined(OS_MACOSX) |
base::mac::ScopedNSAutoreleasePool pool; |
@@ -195,3 +202,7 @@ int main(int argc, char* argv[]) { |
return 0; |
} |
+ |
+#if (defined(OS_LINUX) || defined(OS_OPENBSD)) && !defined(OS_CHROMEOS) |
+#pragma GCC diagnostic pop |
+#endif |