diff options
| author | robert.nagy@gmail.com <robert.nagy@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-15 00:06:16 +0000 |
|---|---|---|
| committer | robert.nagy@gmail.com <robert.nagy@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-15 00:06:16 +0000 |
| commit | e37e88a0c9d8cd3a3dba3b4d8e2af0981a325206 (patch) | |
| tree | ebb143dca4d6fb60cedf92760c3b112e2b9ace32 /base/file_util_posix.cc | |
| parent | 8d96d62d772beae3eda5bef6f2184074651d9c90 (diff) | |
| download | chromium_src-e37e88a0c9d8cd3a3dba3b4d8e2af0981a325206.zip chromium_src-e37e88a0c9d8cd3a3dba3b4d8e2af0981a325206.tar.gz chromium_src-e37e88a0c9d8cd3a3dba3b4d8e2af0981a325206.tar.bz2 | |
define OS_BSD on *BSD and replace the ifdefs to use that
BUG=
TEST=compile
Review URL: http://codereview.chromium.org/8564020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109986 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/file_util_posix.cc')
| -rw-r--r-- | base/file_util_posix.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc index c365869a..582f70e 100644 --- a/base/file_util_posix.cc +++ b/base/file_util_posix.cc @@ -54,9 +54,8 @@ namespace file_util { namespace { -#if defined(OS_OPENBSD) || defined(OS_FREEBSD) || \ - (defined(OS_MACOSX) && \ - MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5) +#if defined(OS_BSD) || (defined(OS_MACOSX) && \ + MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5) typedef struct stat stat_wrapper_t; static int CallStat(const char *path, stat_wrapper_t *sb) { base::ThreadRestrictions::AssertIOAllowed(); @@ -158,8 +157,8 @@ 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_SOLARIS) && !defined(OS_ANDROID) +#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_BSD) && \ + !defined(OS_SOLARIS) && !defined(OS_ANDROID) #error Port warning: depending on the definition of struct dirent, \ additional space for pathname may be needed #endif @@ -801,8 +800,8 @@ bool FileEnumerator::ReadDirectory(std::vector<DirectoryEntryInfo>* entries, if (!dir) return false; -#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD) && \ - !defined(OS_OPENBSD) && !defined(OS_SOLARIS) && !defined(OS_ANDROID) +#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_BSD) && \ + !defined(OS_SOLARIS) && !defined(OS_ANDROID) #error Port warning: depending on the definition of struct dirent, \ additional space for pathname may be needed #endif |