summaryrefslogtreecommitdiff
path: root/fxbarcode/utils.h
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-09-26 16:08:45 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-09-26 20:24:32 +0000
commit2e4075dea6c988c1e573038af23f561a286daa19 (patch)
treed3b62e0c42a27f8479ed30ab6c67aff28926cfae /fxbarcode/utils.h
parent8c806cf08ff928630142f769ca689f7c89bfd648 (diff)
downloadpdfium-2e4075dea6c988c1e573038af23f561a286daa19.tar.xz
Fix checks for FX_WIN64_DESKTOP
Several of the OS checks were mis-typed as FX_WIN64 instead of FX_WIN64_DESKTOP. This CL updates the defines to check for the correct OS define. Bug: pdfium:906 Change-Id: Ib58a6472d1bc26c34d509edf32ac00b18d852a3b Reviewed-on: https://pdfium-review.googlesource.com/14813 Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'fxbarcode/utils.h')
-rw-r--r--fxbarcode/utils.h21
1 files changed, 12 insertions, 9 deletions
diff --git a/fxbarcode/utils.h b/fxbarcode/utils.h
index 7d5bc0a6d8..6140dd0904 100644
--- a/fxbarcode/utils.h
+++ b/fxbarcode/utils.h
@@ -19,25 +19,28 @@ 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_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_)
+#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
#include <limits>
-#elif(_FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_LINUX_DESKTOP_ || \
- _FX_OS_ == _FX_IOS_)
+#elif _FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_LINUX_DESKTOP_ || \
+ _FX_OS_ == _FX_IOS_
#include <limits.h>
#endif
-#if (_FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_)
+
+#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
#define FXSYS_isnan(x) _isnan(x)
-#elif(_FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_IOS_ || \
- _FX_OS_ == _FX_LINUX_DESKTOP_ || _FX_OS_ == _FX_ANDROID_)
+#elif _FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_IOS_ || \
+ _FX_OS_ == _FX_LINUX_DESKTOP_ || _FX_OS_ == _FX_ANDROID_
#include <cmath>
#define FXSYS_isnan(x) std::isnan(x)
#endif
-#if (_FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_)
+
+#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
#define FXSYS_nan() (std::numeric_limits<float>::quiet_NaN())
-#elif(_FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_LINUX_DESKTOP_ || \
- _FX_OS_ == _FX_IOS_ || _FX_OS_ == _FX_ANDROID_)
+#elif _FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_LINUX_DESKTOP_ || \
+ _FX_OS_ == _FX_IOS_ || _FX_OS_ == _FX_ANDROID_
#define FXSYS_nan() NAN
#endif
+
enum BCFORMAT {
BCFORMAT_UNSPECIFY = -1,
BCFORMAT_CODABAR,