Title: [288835] trunk/Tools
- Revision
- 288835
- Author
- [email protected]
- Date
- 2022-01-31 12:43:07 -0800 (Mon, 31 Jan 2022)
Log Message
[Mac] Fix TestWebKitAPI build
https://bugs.webkit.org/show_bug.cgi?id=235906
Reviewed by Tim Horton.
/usr/include/cups/cups.h has this:
# define UniversalPrint 1
And Source/ThirdParty/gtest/include/gtest/gtest-printers.h has this:
void UniversalPrint(const T& value, ::std::ostream* os);
* TestWebKitAPI/config.h:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (288834 => 288835)
--- trunk/Tools/ChangeLog 2022-01-31 20:40:06 UTC (rev 288834)
+++ trunk/Tools/ChangeLog 2022-01-31 20:43:07 UTC (rev 288835)
@@ -1,3 +1,18 @@
+2022-01-31 Myles C. Maxfield <[email protected]>
+
+ [Mac] Fix TestWebKitAPI build
+ https://bugs.webkit.org/show_bug.cgi?id=235906
+
+ Reviewed by Tim Horton.
+
+ /usr/include/cups/cups.h has this:
+ # define UniversalPrint 1
+
+ And Source/ThirdParty/gtest/include/gtest/gtest-printers.h has this:
+ void UniversalPrint(const T& value, ::std::ostream* os);
+
+ * TestWebKitAPI/config.h:
+
2022-01-31 J Pascoe <[email protected]>
[WebAuthn] Provide SPI to export/import local credentials
Modified: trunk/Tools/TestWebKitAPI/config.h (288834 => 288835)
--- trunk/Tools/TestWebKitAPI/config.h 2022-01-31 20:40:06 UTC (rev 288834)
+++ trunk/Tools/TestWebKitAPI/config.h 2022-01-31 20:43:07 UTC (rev 288835)
@@ -91,6 +91,7 @@
#ifdef __cplusplus
// The TestJSC executable doesn't use gtest it uses glib's testing
#if !defined(BUILDING_TestJSC) && !defined(NO_GTEST_USAGE)
+#undef UniversalPrint
#include <gtest/gtest.h>
#endif
#include <wtf/Assertions.h>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
