Changeset 138894 in webkit

Timestamp:

Jan 5, 2013 12:02:49 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Fix compilation of MathExtras.h with MinGW-w64
​https://bugs.webkit.org/show_bug.cgi?id=106105

Patch by Jonathan Liu <​net147@gmail.com> on 2013-01-05
Reviewed by Simon Hausmann.

The isfinite and isinf functions are required by wtf_pow but
not defined until after wtf_pow. Move wtf_pow to after
"using std::isfinite" and "using std::isinf" to fix compilation.

• wtf/MathExtras.h:

(wtf_pow):

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/MathExtras.h (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2013-01-05  Jonathan Liu  <net147@gmail.com>
+
+        Fix compilation of MathExtras.h with MinGW-w64
+        https://bugs.webkit.org/show_bug.cgi?id=106105
+
+        Reviewed by Simon Hausmann.
+
+        The isfinite and isinf functions are required by wtf_pow but
+        not defined until after wtf_pow. Move wtf_pow to after
+        "using std::isfinite" and "using std::isinf" to fix compilation.
+
+        * wtf/MathExtras.h:
+        (wtf_pow):
+
 2013-01-03  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/WTF/wtf/MathExtras.h

@@ -227 +227 @@
 #endif // COMPILER(MSVC)
 
-#if COMPILER(MINGW64)
-inline double wtf_pow(double x, double y)
-{
-    // MinGW-w64 has a custom implementation for pow.
-    // This handles certain special cases that are different.
-    if ((x == 0.0 || isinf(x)) && isfinite(y)) {
-        double f;
-        if (modf(y, &f) != 0.0)
-            return ((x == 0.0) ^ (y > 0.0)) ? std::numeric_limits<double>::infinity() : 0.0;
-    }
-
-    if (x == 2.0) {
-        int yInt = static_cast<int>(y);
-        if (y == yInt)
-            return ldexp(1.0, yInt);
-    }
-
-    return pow(x, y);
-}
-#define pow(x, y) wtf_pow(x, y)
-#endif // COMPILER(MINGW64)
-
 inline double deg2rad(double d)  { return d * piDouble / 180.0; }
 inline double rad2deg(double r)  { return r * 180.0 / piDouble; }
@@ -369 +347 @@
 #endif
 #endif
+
+#if COMPILER(MINGW64)
+inline double wtf_pow(double x, double y)
+{
+    // MinGW-w64 has a custom implementation for pow.
+    // This handles certain special cases that are different.
+    if ((x == 0.0 || isinf(x)) && isfinite(y)) {
+        double f;
+        if (modf(y, &f) != 0.0)
+            return ((x == 0.0) ^ (y > 0.0)) ? std::numeric_limits<double>::infinity() : 0.0;
+    }
+
+    if (x == 2.0) {
+        int yInt = static_cast<int>(y);
+        if (y == yInt)
+            return ldexp(1.0, yInt);
+    }
+
+    return pow(x, y);
+}
+#define pow(x, y) wtf_pow(x, y)
+#endif // COMPILER(MINGW64)