X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2415cf6725d5cfb11f52d29e5d28dfdaa197b366..9c34a216817028bc533e07873d047208a96b05a2:/include/wx/math.h?ds=sidebyside diff --git a/include/wx/math.h b/include/wx/math.h index 5ce3ff1c36..c1dda9e6d2 100644 --- a/include/wx/math.h +++ b/include/wx/math.h @@ -57,12 +57,17 @@ #if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__) #include #define wxFinite(x) _finite(x) -#elif defined(__MINGW64__) +#elif defined(__MINGW64__) || defined(__clang__) /* add more compilers with C99 support here: using C99 isfinite() is preferable to using BSD-ish finite() */ - #define wxFinite(x) isfinite(x) + #if defined(_GLIBCXX_CMATH) || defined(_LIBCPP_CMATH) + // these headers #undef isfinite + #define wxFinite(x) std::isfinite(x) + #else + #define wxFinite(x) isfinite(x) + #endif #elif ( defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \ defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \ defined(__HPUX__) ) && ( !defined(wxOSX_USE_IPHONE) || wxOSX_USE_IPHONE == 0 ) @@ -107,8 +112,9 @@ } #else /* !__INTELC__ */ - + wxGCC_WARNING_SUPPRESS(float-equal) inline bool wxIsSameDouble(double x, double y) { return x == y; } + wxGCC_WARNING_RESTORE(float-equal) #endif /* __INTELC__/!__INTELC__ */