diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-28 06:18:10 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-28 06:18:10 +0000 |
| commit | b6d95cdf09e4d71a1d6aab9b87003da83022840a (patch) | |
| tree | d6c77c63b832e49e95264cab1718b40392e32cfa | |
| parent | 6071db17c9a126968cf0e06be4902691167d0189 (diff) | |
| download | chromium_src-b6d95cdf09e4d71a1d6aab9b87003da83022840a.zip chromium_src-b6d95cdf09e4d71a1d6aab9b87003da83022840a.tar.gz chromium_src-b6d95cdf09e4d71a1d6aab9b87003da83022840a.tar.bz2 | |
Only include base/file_util_deprecated.h on Windows.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/9480020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123922 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/file_util.h | 2 | ||||
| -rw-r--r-- | base/file_util_deprecated.h | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/base/file_util.h b/base/file_util.h index 7b46b5f..54969f6 100644 --- a/base/file_util.h +++ b/base/file_util.h @@ -639,8 +639,10 @@ BASE_EXPORT bool GetFileSystemType(const FilePath& path, FileSystemType* type); } // namespace file_util +#if defined(OS_WIN) // Deprecated functions have been moved to this separate header file, // which must be included last after all the above definitions. #include "base/file_util_deprecated.h" +#endif #endif // BASE_FILE_UTIL_H_ diff --git a/base/file_util_deprecated.h b/base/file_util_deprecated.h index 4b3238d..1335ef4e 100644 --- a/base/file_util_deprecated.h +++ b/base/file_util_deprecated.h @@ -20,7 +20,9 @@ // We've successfully deprecated all of these functions on non-Windows // platforms. -#if defined(OS_WIN) +#if !defined(OS_WIN) +#error Do not include on non-Windows platforms. +#endif namespace file_util { @@ -45,6 +47,4 @@ BASE_EXPORT int WriteFile(const std::wstring& filename, } // namespace file_util -#endif // OS_WIN - #endif // BASE_FILE_UTIL_DEPRECATED_H_ |