X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d98a58c543948d84d9287e6fa53a5539d662b7a5..a4f6fe43c33bd7933645d110ad2719871dab043d:/include/wx/math.h diff --git a/include/wx/math.h b/include/wx/math.h index 38b444e2df..5240f1759e 100644 --- a/include/wx/math.h +++ b/include/wx/math.h @@ -57,7 +57,7 @@ #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() @@ -65,7 +65,7 @@ #define wxFinite(x) isfinite(x) #elif ( defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \ defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \ - defined(__HPUX__)||defined(__MWERKS__) ) && ( !defined(wxOSX_USE_IPHONE) || wxOSX_USE_IPHONE == 0 ) + defined(__HPUX__) ) && ( !defined(wxOSX_USE_IPHONE) || wxOSX_USE_IPHONE == 0 ) #ifdef __SOLARIS__ #include #endif @@ -79,7 +79,7 @@ #define wxIsNaN(x) _isnan(x) #elif defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \ defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \ - defined(__HPUX__)||defined(__MWERKS__) + defined(__HPUX__) #define wxIsNaN(x) isnan(x) #else #define wxIsNaN(x) ((x) != (x)) @@ -107,8 +107,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__ */