Title: [276591] trunk/Source/WebCore
- Revision
- 276591
- Author
- don.olmst...@sony.com
- Date
- 2021-04-26 08:04:42 -0700 (Mon, 26 Apr 2021)
Log Message
ANGLE X11 build fixes
https://bugs.webkit.org/show_bug.cgi?id=225003
Reviewed by Kenneth Russell.
X11 headers define a bunch of macros with common terms, interfering with WebCore and WTF
enum values. As a workaround, we explicitly undef them.
This is the same fix as the one to GLContext.h in r274869 but applied to the ANGLE headers
that are including X11.
* platform/graphics/angle/ANGLEHeaders.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (276590 => 276591)
--- trunk/Source/WebCore/ChangeLog 2021-04-26 14:28:12 UTC (rev 276590)
+++ trunk/Source/WebCore/ChangeLog 2021-04-26 15:04:42 UTC (rev 276591)
@@ -1,3 +1,18 @@
+2021-04-26 Don Olmstead <don.olmst...@sony.com>
+
+ ANGLE X11 build fixes
+ https://bugs.webkit.org/show_bug.cgi?id=225003
+
+ Reviewed by Kenneth Russell.
+
+ X11 headers define a bunch of macros with common terms, interfering with WebCore and WTF
+ enum values. As a workaround, we explicitly undef them.
+
+ This is the same fix as the one to GLContext.h in r274869 but applied to the ANGLE headers
+ that are including X11.
+
+ * platform/graphics/angle/ANGLEHeaders.h:
+
2021-04-26 Antti Koivisto <an...@apple.com>
Refcount Style::Resolver
Modified: trunk/Source/WebCore/platform/graphics/angle/ANGLEHeaders.h (276590 => 276591)
--- trunk/Source/WebCore/platform/graphics/angle/ANGLEHeaders.h 2021-04-26 14:28:12 UTC (rev 276590)
+++ trunk/Source/WebCore/platform/graphics/angle/ANGLEHeaders.h 2021-04-26 15:04:42 UTC (rev 276591)
@@ -47,6 +47,42 @@
#include <ANGLE/entry_points_gles_3_0_autogen.h>
#include <ANGLE/entry_points_gles_ext_autogen.h>
+// X11 headers define a bunch of macros with common terms, interfering with WebCore and WTF enum values.
+// As a workaround, we explicitly undef them here.
+#if defined(None)
+#undef None
+#endif
+#if defined(Above)
+#undef Above
+#endif
+#if defined(Below)
+#undef Below
+#endif
+#if defined(Success)
+#undef Success
+#endif
+#if defined(False)
+#undef False
+#endif
+#if defined(True)
+#undef True
+#endif
+#if defined(Bool)
+#undef Bool
+#endif
+#if defined(Always)
+#undef Always
+#endif
+#if defined(Status)
+#undef Status
+#endif
+#if defined(Continue)
+#undef Continue
+#endif
+#if defined(Region)
+#undef Region
+#endif
+
// Note: this file can't be compiled in the same unified source file
// as others which include the system's OpenGL headers.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
