summaryrefslogtreecommitdiff
path: root/fxbarcode
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-09-28 08:51:48 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-09-28 15:27:49 +0000
commit9c392c82abee05ac2fd42e69984e2de8e48b797a (patch)
tree0922ea5a2db6b1d2df95e6129663a00ba47499a7 /fxbarcode
parent94df367590a2ccd4f799df8958ddc014f496edb1 (diff)
downloadpdfium-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 'fxbarcode')
-rw-r--r--fxbarcode/utils.h25
1 files changed, 11 insertions, 14 deletions
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<uint8_t>& ba);
-#if _FX_OS_ == _FX_OS_WIN32_ || _FX_OS_ == _FX_OS_WIN64_
+#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
#include <limits>
-#elif _FX_OS_ == _FX_OS_MACOSX_ || _FX_OS_ == _FX_OS_LINUX_
-#include <limits.h>
-#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<float>::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 <limits.h>
+#endif // _FX_OS_ == _FX_OS_MACOSX_ || _FX_OS_ == _FX_OS_LINUX_
+
#include <cmath>
#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<float>::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,