[PATCH weston] Fix build error caused by missing header inclusion

Derek Foreman derekf at osg.samsung.com
Fri Nov 13 08:34:58 PST 2015


On 13/11/15 07:34 AM, ahmet acar wrote:
> Hi. This fix that: 
> 
> https://bugs.freedesktop.org/show_bug.cgi?id=92104
> 

This is a harmless solution to a disgusting problem with eglplatform.h

Basically, if you have no X11 include files and you include
eglplatform.h without -DMESA_EGL_NO_X11_HEADERS then eglplatform.h will
try to #include X11/Xlib.h and X11/Xutil.h

if you include wayland-egl.h first it will define WL_EGL_PLATFORM which
shorts out a bunch of logic before it even gets to the
EGL_NO_X11_HEADERS check.

This patch is probably the least worst solution to the problem, so...
pushed.

Ahmet, I'll write a commit log and add the appropriate attribution for
this patch, but in the future it'd make it easier to land your
contributions if you set up git send-email.

Thanks for sorting this out.

Reviewed-by: Derek Foreman <derekf at osg.samsung.com>

(and pushed...)

> ---
>  shared/platform.h | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/shared/platform.h b/shared/platform.h
> index 64e1fbf..cf4ecc0 100644
> --- a/shared/platform.h
> +++ b/shared/platform.h
> @@ -29,6 +29,7 @@
>  #include <string.h>
>  
>  #ifdef ENABLE_EGL
> +#include <wayland-egl.h>
>  #include <EGL/egl.h>
>  #include <EGL/eglext.h>
>  #endif
> 



More information about the wayland-devel mailing list