On Thu, 16 Feb 2017 21:52:23 +0000 Daniel Stone <[email protected]> wrote:
> 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 <[email protected]> > Cc: Emil Velikov <[email protected]> > Cc: Bryce Harrington <[email protected]> > --- > 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; Hi, how do you trigger this build failure? I'm building with cairo=image and EGL enabled, and I haven't seen this issue. Reading the code, I believe the problem is when: #define ENABLE_EGL /* #undef HAVE_CAIRO_EGL */ But that is how my config.h always ends up. Is it a compiler version thing? Do different EGL stacks define things differently? However, I do see the path how one gets those redefined and I should be hitting it every time I build, but apparently my gcc 4.9 just silently ignores the redefinition. Anyway: Reviewed-by: Pekka Paalanen <[email protected]> I would be ok landing this for the release, but since we are so close to the final release perhaps and I have not seen the failure myself (I cannot give a Tested-by), I'll leave the decision for Bryce. At least it does not regress my usual build. Thanks, pq
pgprsS6sQE_Yb.pgp
Description: OpenPGP digital signature
_______________________________________________ wayland-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/wayland-devel
