[PATCH weston] clients: Fix build without Cairo/GLES2

Daniel Stone daniels at collabora.com
Thu Feb 16 21:52:23 UTC 2017


If we're building with EGL support generally, but without Cairo/GLESv2,
building the clients fail, because window.c defines the EGL native
types, however platform.h also brings these in.

Signed-off-by: Daniel Stone <daniels at collabora.com>
Cc: Emil Velikov <emil.velikov at collabora.com>
Cc: Bryce Harrington <brycef at osg.samsung.com>
---
 clients/window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clients/window.c b/clients/window.c
index 59fc07e..95796d4 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -55,7 +55,7 @@
 #include <EGL/eglext.h>
 
 #include <cairo-gl.h>
-#else /* HAVE_CAIRO_EGL */
+#elif !defined(ENABLE_EGL) /* platform.h defines these if EGL is enabled */
 typedef void *EGLDisplay;
 typedef void *EGLConfig;
 typedef void *EGLContext;
-- 
2.9.3



More information about the wayland-devel mailing list