diff options
| author | Simon Ser <contact@emersion.fr> | 2020-01-24 15:53:22 +0100 |
|---|---|---|
| committer | Scott Anderson <scott@anderso.nz> | 2020-01-24 21:33:12 +0000 |
| commit | 7f2bd0b21116e4cc3943b3bccf75cb94f95c1fc3 (patch) | |
| tree | e60c3054b6d01c61c0be29918f8418d98dbe565b | |
| parent | 144d2041adfba155e7596d5e5e16beecfd05a0e3 (diff) | |
render: unconditionally disable implicit X11 includes
Even if the X11 backend or Xwayland is enabled, we don't rely on
EGL/egl.h including Xlib headers.
| -rw-r--r-- | include/wlr/render/egl.h | 4 | ||||
| -rw-r--r-- | include/wlr/render/interface.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/include/wlr/render/egl.h b/include/wlr/render/egl.h index 2853f8ed..d0dcaf5b 100644 --- a/include/wlr/render/egl.h +++ b/include/wlr/render/egl.h @@ -9,16 +9,12 @@ #ifndef WLR_RENDER_EGL_H #define WLR_RENDER_EGL_H -#include <wlr/config.h> - -#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND #ifndef MESA_EGL_NO_X11_HEADERS #define MESA_EGL_NO_X11_HEADERS #endif #ifndef EGL_NO_X11 #define EGL_NO_X11 #endif -#endif #include <EGL/egl.h> #include <EGL/eglext.h> diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h index 21c1e044..4e992077 100644 --- a/include/wlr/render/interface.h +++ b/include/wlr/render/interface.h @@ -9,16 +9,12 @@ #ifndef WLR_RENDER_INTERFACE_H #define WLR_RENDER_INTERFACE_H -#include <wlr/config.h> - -#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND #ifndef MESA_EGL_NO_X11_HEADERS #define MESA_EGL_NO_X11_HEADERS #endif #ifndef EGL_NO_X11 #define EGL_NO_X11 #endif -#endif #include <EGL/egl.h> #include <EGL/eglext.h> |