diff options
| author | yael.aharon@intel.com <yael.aharon@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-04 06:46:08 +0000 |
|---|---|---|
| committer | yael.aharon@intel.com <yael.aharon@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-04 06:46:08 +0000 |
| commit | 87986edaa09ffc9c1c78947f540fcdb75eb08f9f (patch) | |
| tree | d59a4a51f3fdc943a4c3f1890f09bef615e2c290 /net | |
| parent | 7ffde472a24e440df7c1fc8dceba86a2bfb1e9a2 (diff) | |
| download | chromium_src-87986edaa09ffc9c1c78947f540fcdb75eb08f9f.zip chromium_src-87986edaa09ffc9c1c78947f540fcdb75eb08f9f.tar.gz chromium_src-87986edaa09ffc9c1c78947f540fcdb75eb08f9f.tar.bz2 | |
net_watcher does not build in Ubuntu 13.04
This is due to a deprecation warning in glib. Added a flag to suppress deprecation warnings.
BUG=245658
Review URL: https://chromiumcodereview.appspot.com/15792013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203873 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/tools/net_watcher/net_watcher.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/tools/net_watcher/net_watcher.cc b/net/tools/net_watcher/net_watcher.cc index 426fea17..4f85f48 100644 --- a/net/tools/net_watcher/net_watcher.cc +++ b/net/tools/net_watcher/net_watcher.cc @@ -134,7 +134,12 @@ int main(int argc, char* argv[]) { #if (defined(OS_LINUX) || defined(OS_OPENBSD)) && !defined(OS_CHROMEOS) // Needed so ProxyConfigServiceLinux can use gconf. // Normally handled by BrowserMainLoop::InitializeToolkit(). + // From glib version 2.36 onwards, g_type_init is implicitly called and it is + // deprecated. +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" g_type_init(); +#pragma GCC diagnostic pop #endif base::AtExitManager exit_manager; CommandLine::Init(argc, argv); |