Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / math.h

diff --git a/include/wx/math.h b/include/wx/math.h
index 7de104caecd149acd013a211a7bf0baeb8de9e2f..5240f1759e527b4cf61b840bc53f4fd5a005e83b 100644 (file)
--- a/include/wx/math.h
+++ b/include/wx/math.h
@@ -57,7 +57,7 @@
 #if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__)
     #include <float.h>
     #define wxFinite(x) _finite(x)
 #if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__)
     #include <float.h>
     #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()
     /*
         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__)|| \
     #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 <ieeefp.h>
 #endif
 #ifdef __SOLARIS__
 #include <ieeefp.h>
 #endif


@@ -79,7 +79,7 @@
     #define wxIsNaN(x) _isnan(x)
 #elif defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \
       defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \
     #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))
     #define wxIsNaN(x) isnan(x)
 #else
     #define wxIsNaN(x) ((x) != (x))


@@ -107,8 +107,9 @@
         }
 
     #else /* !__INTELC__ */
         }
 
     #else /* !__INTELC__ */

-
+        wxGCC_WARNING_SUPPRESS(float-equal)

         inline bool wxIsSameDouble(double x, double y) { return x == y; }
         inline bool wxIsSameDouble(double x, double y) { return x == y; }

+        wxGCC_WARNING_RESTORE(float-equal)

 
     #endif /* __INTELC__/!__INTELC__ */
 
 
     #endif /* __INTELC__/!__INTELC__ */
 


@@ -128,7 +129,7 @@
 #endif /* __cplusplus */
 
 
 #endif /* __cplusplus */
 
 

-#if defined(__WXMSW__) && !defined(__WXWINCE__)
+#if defined(__WINDOWS__) && !defined(__WXWINCE__)

     #define wxMulDivInt32( a , b , c ) ::MulDiv( a , b , c )
 #else
     #define wxMulDivInt32( a , b , c ) (wxRound((a)*(((wxDouble)b)/((wxDouble)c))))
     #define wxMulDivInt32( a , b , c ) ::MulDiv( a , b , c )
 #else
     #define wxMulDivInt32( a , b , c ) (wxRound((a)*(((wxDouble)b)/((wxDouble)c))))