blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Simon Ser 2020-01-24 15:53:22 +01:00 committed by Scott Anderson
parent 144d2041ad
commit 7f2bd0b211
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wlr/render/egl.h
View File

@ -9,16 +9,12 @@
#ifndef WLR_RENDER_EGL_H #ifndef WLR_RENDER_EGL_H
#define 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 #ifndef MESA_EGL_NO_X11_HEADERS
#define MESA_EGL_NO_X11_HEADERS #define MESA_EGL_NO_X11_HEADERS
#endif #endif
#ifndef EGL_NO_X11 #ifndef EGL_NO_X11
#define EGL_NO_X11 #define EGL_NO_X11
#endif #endif
#endif
#include <EGL/egl.h> #include <EGL/egl.h>
#include <EGL/eglext.h> #include <EGL/eglext.h>

4
include/wlr/render/interface.h
View File

@ -9,16 +9,12 @@
#ifndef WLR_RENDER_INTERFACE_H #ifndef WLR_RENDER_INTERFACE_H
#define 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 #ifndef MESA_EGL_NO_X11_HEADERS
#define MESA_EGL_NO_X11_HEADERS #define MESA_EGL_NO_X11_HEADERS
#endif #endif
#ifndef EGL_NO_X11 #ifndef EGL_NO_X11
#define EGL_NO_X11 #define EGL_NO_X11
#endif #endif
#endif
#include <EGL/egl.h> #include <EGL/egl.h>
#include <EGL/eglext.h> #include <EGL/eglext.h>