From f02f7e58b56b324d352322335636b3bf44d961d8 Mon Sep 17 00:00:00 2001 From: "phajdan.jr" Date: Tue, 31 May 2016 12:20:37 -0700 Subject: =?UTF-8?q?Fix=20compile=20error=20=E2=80=98isnan=E2=80=99=20was?= =?UTF-8?q?=20not=20declared=20in=20this=20scope?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BUG=none Review-Url: https://codereview.chromium.org/2022793002 --- xfa/fxbarcode/utils.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xfa/fxbarcode/utils.h b/xfa/fxbarcode/utils.h index ca2f3214c0..dadf34859d 100644 --- a/xfa/fxbarcode/utils.h +++ b/xfa/fxbarcode/utils.h @@ -26,12 +26,10 @@ void BC_FX_ByteString_Append(CFX_ByteString& dst, const CFX_ByteArray& ba); #endif #if (_FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_) #define FXSYS_isnan(x) _isnan(x) -#elif(_FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_IOS_) +#elif(_FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_IOS_ || \ + _FX_OS_ == _FX_LINUX_DESKTOP_ || _FX_OS_ == _FX_ANDROID_) #include #define FXSYS_isnan(x) std::isnan(x) -#elif(_FX_OS_ == _FX_LINUX_DESKTOP_ || _FX_OS_ == _FX_ANDROID_) -#include -#define FXSYS_isnan(x) isnan(x) #endif #if (_FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_) #define FXSYS_nan() (std::numeric_limits::quiet_NaN()) -- cgit v1.2.3