diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-18 16:11:37 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-18 16:11:37 +0000 |
| commit | b5c72b82b5b19a3268ea5df60b79322f7f779027 (patch) | |
| tree | 27bbd22eccca76f350d0e6350e78dcd20f297104 /base | |
| parent | c04057c9f62073cd266eebe462dd777f8fe6d7a5 (diff) | |
| download | chromium_src-b5c72b82b5b19a3268ea5df60b79322f7f779027.zip chromium_src-b5c72b82b5b19a3268ea5df60b79322f7f779027.tar.gz chromium_src-b5c72b82b5b19a3268ea5df60b79322f7f779027.tar.bz2 | |
Solaris: Second set adding in Solaris as an OS option
TEST=compiles
BUG=30101
Patch by James Choi <jchoi42@pha.jhu.edu>.
Review URL: http://codereview.chromium.org/606075
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/base.gyp | 8 | ||||
| -rw-r--r-- | base/file_util_posix.cc | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/base/base.gyp b/base/base.gyp index 8e941a3..f4720b4 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -149,7 +149,7 @@ '../testing/gtest.gyp:gtest', ], 'conditions': [ - ['OS == "linux" or OS == "freebsd" or OS == "openbsd"', { + ['OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { 'sources!': [ 'file_version_info_unittest.cc', 'worker_pool_linux_unittest.cc', @@ -167,7 +167,7 @@ '../build/linux/system.gyp:nss', '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], - }, { # OS != "linux" and OS != "freebsd" and OS != "openbsd" + }, { # OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris" 'sources!': [ 'message_pump_glib_unittest.cc', ] @@ -230,7 +230,7 @@ ], }, 'conditions': [ - ['OS == "linux" or OS == "freebsd" or OS == "openbsd"', { + ['OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { 'dependencies': [ # Needed to handle the #include chain: # base/test/perf_test_suite.h @@ -259,7 +259,7 @@ }, ], }], - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { + [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { 'targets': [ { 'target_name': 'linux_versioninfo', diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc index 6e8735a..590b94d 100644 --- a/base/file_util_posix.cc +++ b/base/file_util_posix.cc @@ -87,7 +87,7 @@ int CountFilesCreatedAfter(const FilePath& path, DIR* dir = opendir(path.value().c_str()); if (dir) { #if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD) && \ - !defined(OS_OPENBSD) + !defined(OS_OPENBSD) && !defined(OS_SOLARIS) #error Port warning: depending on the definition of struct dirent, \ additional space for pathname may be needed #endif @@ -645,7 +645,7 @@ bool FileEnumerator::ReadDirectory(std::vector<DirectoryEntryInfo>* entries, return false; #if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD) && \ - !defined(OS_OPENBSD) + !defined(OS_OPENBSD) && !defined(OS_SOLARIS) #error Port warning: depending on the definition of struct dirent, \ additional space for pathname may be needed #endif |