From 9c392c82abee05ac2fd42e69984e2de8e48b797a Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 28 Sep 2017 08:51:48 -0400 Subject: 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 Commit-Queue: dsinclair --- fxbarcode/utils.h | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'fxbarcode') diff --git a/fxbarcode/utils.h b/fxbarcode/utils.h index 55d1c96af0..9e6c70fe7c 100644 --- a/fxbarcode/utils.h +++ b/fxbarcode/utils.h @@ -19,26 +19,23 @@ bool BC_FX_ByteString_Replace(ByteString& dst, void BC_FX_ByteString_Append(ByteString& dst, int32_t count, char c); void BC_FX_ByteString_Append(ByteString& dst, const std::vector& ba); -#if _FX_OS_ == _FX_OS_WIN32_ || _FX_OS_ == _FX_OS_WIN64_ +#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ #include -#elif _FX_OS_ == _FX_OS_MACOSX_ || _FX_OS_ == _FX_OS_LINUX_ -#include -#endif - -#if _FX_OS_ == _FX_OS_WIN32_ || _FX_OS_ == _FX_OS_WIN64_ #define FXSYS_isnan(x) _isnan(x) -#elif _FX_OS_ == _FX_OS_MACOSX_ || _FX_OS_ == _FX_OS_LINUX_ || \ +#define FXSYS_nan() (std::numeric_limits::quiet_NaN()) +#endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ + +#if _FX_OS_ == _FX_OS_MACOSX_ || _FX_OS_ == _FX_OS_LINUX_ || \ _FX_OS_ == _FX_OS_ANDROID_ +#if _FX_OS_ == _FX_OS_MACOSX_ || _FX_OS_ == _FX_OS_LINUX_ +#include +#endif // _FX_OS_ == _FX_OS_MACOSX_ || _FX_OS_ == _FX_OS_LINUX_ + #include #define FXSYS_isnan(x) std::isnan(x) -#endif - -#if _FX_OS_ == _FX_OS_WIN32_ || _FX_OS_ == _FX_OS_WIN64_ -#define FXSYS_nan() (std::numeric_limits::quiet_NaN()) -#elif _FX_OS_ == _FX_OS_MACOSX_ || _FX_OS_ == _FX_OS_LINUX_ || \ - _FX_OS_ == _FX_OS_ANDROID_ #define FXSYS_nan() NAN -#endif +#endif // _FX_OS_ == _FX_OS_MACOSX_ || _FX_OS_ == _FX_OS_LINUX_ || \ + // _FX_OS_ == _FX_OS_ANDROID_ enum BCFORMAT { BCFORMAT_UNSPECIFY = -1, -- cgit v1.2.3