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

[Bryce Harrington]

On Mon, Feb 20, 2017 at 03:46:55PM +0000, Emil Velikov wrote:
> On 16 February 2017 at 21:52, Daniel Stone <daniels at collabora.com> 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 <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;
> Not a huge expert on the permutations available here, but this seems correct.
> Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
> 
> Fwiw typedef redefinition is a C11 feature. Add -pedantic to GCC to flag it up.
> Although yes, the define has also changed, even if it expands to
> 
> #define EGL_NO_DISPLAY ((EGLDisplay)(0))
> 
> -Emil

Acked-by: Bryce Harrington <bryce at osg.samsung.com>