From 7f2bd0b21116e4cc3943b3bccf75cb94f95c1fc3 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Fri, 24 Jan 2020 15:53:22 +0100
Subject: [PATCH] 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.
---
 include/wlr/render/egl.h       | 4 ----
 include/wlr/render/interface.h | 4 ----
 2 files changed, 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>