Title: [147972] trunk/Source/WTF
Revision
147972
Author
[email protected]
Date
2013-04-08 18:27:49 -0700 (Mon, 08 Apr 2013)

Log Message

[BlackBerry] MathExtras: macros defined in math.h conflict with the real functions
https://bugs.webkit.org/show_bug.cgi?id=112683

Patch by Alberto Garcia <[email protected]> on 2013-04-08
Reviewed by Darin Adler.

After calls to signbit and friends were prefixed with std:: in
r143232, the BlackBerry port no longer compiles.

The solution is to get rid of the macros defined in math.h and use
the real functions instead.

* wtf/MathExtras.h:

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (147971 => 147972)


--- trunk/Source/WTF/ChangeLog	2013-04-09 01:06:55 UTC (rev 147971)
+++ trunk/Source/WTF/ChangeLog	2013-04-09 01:27:49 UTC (rev 147972)
@@ -1,3 +1,18 @@
+2013-04-08  Alberto Garcia  <[email protected]>
+
+        [BlackBerry] MathExtras: macros defined in math.h conflict with the real functions
+        https://bugs.webkit.org/show_bug.cgi?id=112683
+
+        Reviewed by Darin Adler.
+
+        After calls to signbit and friends were prefixed with std:: in
+        r143232, the BlackBerry port no longer compiles.
+
+        The solution is to get rid of the macros defined in math.h and use
+        the real functions instead.
+
+        * wtf/MathExtras.h:
+
 2013-04-08  Max Vujovic  <[email protected]>
 
         REGRESSION (r147502): Animations of CA filters broken

Modified: trunk/Source/WTF/wtf/MathExtras.h (147971 => 147972)


--- trunk/Source/WTF/wtf/MathExtras.h	2013-04-09 01:06:55 UTC (rev 147971)
+++ trunk/Source/WTF/wtf/MathExtras.h	2013-04-09 01:27:49 UTC (rev 147972)
@@ -48,6 +48,11 @@
 // namespace. For now, we include math.h since the QNX cmath header only imports its functions
 // into the standard namespace.
 #include <math.h>
+// These macros from math.h conflict with the real functions in the std namespace.
+#undef signbit
+#undef isnan
+#undef isinf
+#undef isfinite
 #endif
 
 #ifndef M_PI
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to