Chromium Code Reviews| 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 67eb124f8ac5f05e220a86812e698763ea410f6c..e5582609e744af0799d01684ded47014055ccd74 100644 |
| --- a/net/tools/net_watcher/net_watcher.cc |
| +++ b/net/tools/net_watcher/net_watcher.cc |
| @@ -21,7 +21,7 @@ |
| #include "net/proxy/proxy_config_service.h" |
| #include "net/proxy/proxy_service.h" |
| -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| +#if defined(USE_GLIB) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
|
Lei Zhang
2014/05/22 23:59:07
This should just be #if defined(USE_GLIB). I have
|
| #include <glib-object.h> |
| #endif |
| @@ -131,7 +131,7 @@ int main(int argc, char* argv[]) { |
| #if defined(OS_MACOSX) |
| base::mac::ScopedNSAutoreleasePool pool; |
| #endif |
| -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| +#if defined(USE_GLIB) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| // g_type_init will be deprecated in 2.36. 2.35 is the development |
| // version for 2.36, hence do not call g_type_init starting 2.35. |
| // http://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#g-type-init |
| @@ -140,7 +140,7 @@ int main(int argc, char* argv[]) { |
| // Normally handled by BrowserMainLoop::InitializeToolkit(). |
| g_type_init(); |
| #endif |
| -#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| +#endif // defined(USE_GLIB) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| base::AtExitManager exit_manager; |
| CommandLine::Init(argc, argv); |
| logging::LoggingSettings settings; |