X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/163b3ad72c6729733881e74608af586a99f43726..51623cc53f350935337e57930eaaf1afe9a48c3b:/include/wx/math.h diff --git a/include/wx/math.h b/include/wx/math.h index e5fdef0a58..5240f1759e 100644 --- a/include/wx/math.h +++ b/include/wx/math.h @@ -24,7 +24,7 @@ /* Scaling factors for various unit conversions: 1 inch = 2.54 cm */ #ifndef METRIC_CONVERSION_CONSTANT - #define METRIC_CONVERSION_CONSTANT (1./254) + #define METRIC_CONVERSION_CONSTANT (1/25.4) #endif #ifndef mm2inches @@ -57,9 +57,18 @@ #if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__) #include #define wxFinite(x) _finite(x) -#elif defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \ +#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) +#elif ( defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \ defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \ - defined(__HPUX__)||defined(__MWERKS__) + defined(__HPUX__) ) && ( !defined(wxOSX_USE_IPHONE) || wxOSX_USE_IPHONE == 0 ) +#ifdef __SOLARIS__ +#include +#endif #define wxFinite(x) finite(x) #else #define wxFinite(x) ((x) == (x)) @@ -70,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)) @@ -86,7 +95,7 @@ // shouldn't be used with doubles, but we get too many of them and // removing these operators is probably not a good idea // - // Maybe we should alway compare doubles up to some "epsilon" precision + // Maybe we should always compare doubles up to some "epsilon" precision #pragma warning(push) // floating-point equality and inequality comparisons are unreliable @@ -98,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__ */ @@ -108,7 +118,7 @@ inline int wxRound(double x) { wxASSERT_MSG( x > INT_MIN - 0.5 && x < INT_MAX + 0.5, - _T("argument out of supported range") ); + wxT("argument out of supported range") ); #if defined(HAVE_ROUND) return int(round(x)); @@ -119,12 +129,10 @@ #endif /* __cplusplus */ -#if defined(__WXMSW__) && !defined(__WXWINCE__) +#if defined(__WINDOWS__) && !defined(__WXWINCE__) #define wxMulDivInt32( a , b , c ) ::MulDiv( a , b , c ) -#elif defined( __WXMAC__ ) - #define wxMulDivInt32( a , b , c ) ( (wxInt32) ( ( (wxInt64)(a) * (wxInt64)(b) ) / (wxInt64)(c) ) ) #else - #define wxMulDivInt32( a , b , c ) ((wxInt32)((a)*(((wxDouble)b)/((wxDouble)c)))) + #define wxMulDivInt32( a , b , c ) (wxRound((a)*(((wxDouble)b)/((wxDouble)c)))) #endif #if wxUSE_APPLE_IEEE @@ -139,7 +147,7 @@ #if WXWIN_COMPATIBILITY_2_8 wxDEPRECATED( WXDLLIMPEXP_BASE wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes) ); wxDEPRECATED( WXDLLIMPEXP_BASE void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes) ); -#endif // WXWIN_COMPATIBILITY_2_8 +#endif #ifdef __cplusplus }