diff options
| author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-04 07:06:10 +0000 |
|---|---|---|
| committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-04 07:06:10 +0000 |
| commit | 2b26c2fb712cf1f1094e20730863b8be73bfc116 (patch) | |
| tree | 56a30c58a8d905b0d5255fc55a712074b808a41a | |
| parent | 8a8241c368a78326e190c2ddbaf8f730953f9c6c (diff) | |
| download | chromium_src-2b26c2fb712cf1f1094e20730863b8be73bfc116.zip chromium_src-2b26c2fb712cf1f1094e20730863b8be73bfc116.tar.gz chromium_src-2b26c2fb712cf1f1094e20730863b8be73bfc116.tar.bz2 | |
Revert 203873 "net_watcher does not build in Ubuntu 13.04"
Broke Chrome Linux builds due to using #pragma GCC inside functions
http://build.chromium.org/p/chromium.chrome/buildstatus?builder=Google%20Chrome%20Linux&number=30432
http://build.chromium.org/p/chromium.chrome/buildstatus?builder=Google%20Chrome%20Linux%20x64&number=41197
> 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
TBR=yael.aharon@intel.com
Review URL: https://codereview.chromium.org/16157007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203885 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/tools/net_watcher/net_watcher.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/tools/net_watcher/net_watcher.cc b/net/tools/net_watcher/net_watcher.cc index 4f85f48..426fea17 100644 --- a/net/tools/net_watcher/net_watcher.cc +++ b/net/tools/net_watcher/net_watcher.cc @@ -134,12 +134,7 @@ 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); |