diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-09-28 08:51:48 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-28 15:27:49 +0000 |
| commit | 9c392c82abee05ac2fd42e69984e2de8e48b797a (patch) | |
| tree | 0922ea5a2db6b1d2df95e6129663a00ba47499a7 /core/fxcrt | |
| parent | 94df367590a2ccd4f799df8958ddc014f496edb1 (diff) | |
| download | pdfium-9c392c82abee05ac2fd42e69984e2de8e48b797a.tar.xz | |
Simplify some OS checks to PLATFORM checks
This CL simplifies the OS == WIN{32|64} checks to be PLATFORM == WINDOWS
checks.
Change-Id: I1493d316dd457b0228e4ef39db4cf1d2b8abf97d
Reviewed-on: https://pdfium-review.googlesource.com/14870
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxcrt')
| -rw-r--r-- | core/fxcrt/cfx_datetime.cpp | 6 | ||||
| -rw-r--r-- | core/fxcrt/cfx_seekablestreamproxy.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/fxcrt/cfx_datetime.cpp b/core/fxcrt/cfx_datetime.cpp index 521e07cb67..38dad0d6ac 100644 --- a/core/fxcrt/cfx_datetime.cpp +++ b/core/fxcrt/cfx_datetime.cpp @@ -92,9 +92,9 @@ bool FX_IsLeapYear(int32_t iYear) { void CFX_DateTime::Now() { FXUT_SYSTEMTIME utLocal; -#if _FX_OS_ == _FX_OS_WIN32_ || _FX_OS_ == _FX_OS_WIN64_ +#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ ::GetLocalTime((LPSYSTEMTIME)&utLocal); -#else // _FX_OS_ == _FX_OS_WIN32_ || _FX_OS_ == _FX_OS_WIN64_ +#else // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ timeval curTime; gettimeofday(&curTime, nullptr); @@ -108,7 +108,7 @@ void CFX_DateTime::Now() { utLocal.wMinute = st.tm_min; utLocal.wSecond = st.tm_sec; utLocal.wMillisecond = curTime.tv_usec / 1000; -#endif // _FX_OS_ == _FX_OS_WIN32_ || _FX_OS_ == _FX_OS_WIN64_ +#endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ year_ = utLocal.wYear; month_ = static_cast<uint8_t>(utLocal.wMonth); diff --git a/core/fxcrt/cfx_seekablestreamproxy.cpp b/core/fxcrt/cfx_seekablestreamproxy.cpp index f2590ecfd6..989c440db1 100644 --- a/core/fxcrt/cfx_seekablestreamproxy.cpp +++ b/core/fxcrt/cfx_seekablestreamproxy.cpp @@ -6,9 +6,9 @@ #include "core/fxcrt/cfx_seekablestreamproxy.h" -#if _FX_OS_ == _FX_OS_WIN32_ || _FX_OS_ == _FX_OS_WIN64_ +#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ #include <io.h> -#endif +#endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ #include <algorithm> #include <limits> |