Changeset 246586 in webkit

Timestamp:

Jun 19, 2019 5:03:15 AM (5 years ago)

Author:

zandobersek@gmail.com

Message:

USE_ANGLE macro can be evaluated without being defined
​https://bugs.webkit.org/show_bug.cgi?id=198991

Reviewed by Carlos Garcia Campos.

• wtf/Platform.h: On platforms not yet defining USE_ANGLE, the

incompatibility check with some other flags leads to the macro being
evaluated even when it was not defined, producing compiler warnings.
To avoid this, the macro should be defined to 0 before the check in
case it was not defined already.

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/Platform.h (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2019-06-19  Zan Dobersek  <zdobersek@igalia.com>
+
+        USE_ANGLE macro can be evaluated without being defined
+        https://bugs.webkit.org/show_bug.cgi?id=198991
+
+        Reviewed by Carlos Garcia Campos.
+
+        * wtf/Platform.h: On platforms not yet defining USE_ANGLE, the
+        incompatibility check with some other flags leads to the macro being
+        evaluated even when it was not defined, producing compiler warnings.
+        To avoid this, the macro should be defined to 0 before the check in
+        case it was not defined already.
+
 2019-06-18  Dean Jackson  <dino@apple.com>
 

trunk/Source/WTF/wtf/Platform.h

@@ -1139 +1139 @@
 
 #if ENABLE(WEBGL)
+#if !defined(USE_ANGLE)
+#define USE_ANGLE 0
+#endif
+
 #if (USE_ANGLE && (USE_OPENGL || USE_OPENGL_ES || (defined(USE_EGL) && USE_EGL)))
 #error USE_ANGLE is incompatible with USE_OPENGL, USE_OPENGL_ES and USE_EGL