From f0ddcd361ea8b20b0a5da8effc30d8c51540f948 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Mon, 2 Nov 2020 10:51:52 +0100 Subject: [PATCH] render: define EGL_NO_PLATFORM_SPECIFIC_TYPES (#2452) This avoids Xlib.h inclusion via EGL headers. See [1] for discussion. This change is based on a Weston commit [2]. [1]: https://github.com/KhronosGroup/EGL-Registry/pull/111 [2]: https://gitlab.freedesktop.org/wayland/weston/commit/526765ddfdfd --- include/wlr/render/egl.h | 3 +++ include/wlr/render/interface.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/include/wlr/render/egl.h b/include/wlr/render/egl.h index d46d95af..b2393177 100644 --- a/include/wlr/render/egl.h +++ b/include/wlr/render/egl.h @@ -15,6 +15,9 @@ #ifndef EGL_NO_X11 #define EGL_NO_X11 #endif +#ifndef EGL_NO_PLATFORM_SPECIFIC_TYPES +#define EGL_NO_PLATFORM_SPECIFIC_TYPES +#endif #include diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h index 93c987b7..998b1cfa 100644 --- a/include/wlr/render/interface.h +++ b/include/wlr/render/interface.h @@ -15,6 +15,9 @@ #ifndef EGL_NO_X11 #define EGL_NO_X11 #endif +#ifndef EGL_NO_PLATFORM_SPECIFIC_TYPES +#define EGL_NO_PLATFORM_SPECIFIC_TYPES +#endif #include #include