diff options
| author | pvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 21:34:43 +0000 |
|---|---|---|
| committer | pvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 21:34:43 +0000 |
| commit | 3faa467f5a4da77c16713ee39f4c7098a8210a7c (patch) | |
| tree | cd78efdf29cbff79717c62db0c05c603a7e0a869 /base | |
| parent | 6c5b9f9df3d703adf1cd76b69b86d87d80215fc9 (diff) | |
| download | chromium_src-3faa467f5a4da77c16713ee39f4c7098a8210a7c.zip chromium_src-3faa467f5a4da77c16713ee39f4c7098a8210a7c.tar.gz chromium_src-3faa467f5a4da77c16713ee39f4c7098a8210a7c.tar.bz2 | |
rid of more OS_LINUX defines, to help the BSD port (work by sprewell & I)
Review URL: http://codereview.chromium.org/2089010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55289 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/test/test_suite.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/base/test/test_suite.h b/base/test/test_suite.h index 85ab068..eb688f4 100644 --- a/base/test/test_suite.h +++ b/base/test/test_suite.h @@ -26,7 +26,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "testing/multiprocess_func_list.h" -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(TOOLKIT_USES_GTK) #include <gtk/gtk.h> #endif @@ -62,10 +62,10 @@ class TestSuite { base::EnableTerminationOnHeapCorruption(); CommandLine::Init(argc, argv); testing::InitGoogleTest(&argc, argv); -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(TOOLKIT_USES_GTK) g_thread_init(NULL); gtk_init_check(&argc, &argv); -#endif // defined(OS_LINUX) +#endif // defined(TOOLKIT_USES_GTK) // Don't add additional code to this constructor. Instead add it to // Initialize(). See bug 6436. } |