From 41cbb80e25a93948459ac7785833e8e64b2f8e28 Mon Sep 17 00:00:00 2001
From: Danilo Spinella <danyspin97@protonmail.com>
Date: Wed, 16 Oct 2019 15:16:53 +0200
Subject: Add new define EGL_NO_X11 for newer mesa library

Define both MESA_EGL_NO_X11_HEADERS and EGL_NO_X11 for
backward combatibility.
---
 include/wlr/render/egl.h       | 7 ++++++-
 include/wlr/render/interface.h | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/wlr/render/egl.h b/include/wlr/render/egl.h
index 915de5c0..efded0b6 100644
--- a/include/wlr/render/egl.h
+++ b/include/wlr/render/egl.h
@@ -11,9 +11,14 @@
 
 #include <wlr/config.h>
 
-#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND && !defined MESA_EGL_NO_X11_HEADERS
+#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 088b1efa..21c1e044 100644
--- a/include/wlr/render/interface.h
+++ b/include/wlr/render/interface.h
@@ -11,9 +11,14 @@
 
 #include <wlr/config.h>
 
-#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND && !defined MESA_EGL_NO_X11_HEADERS
+#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>
-- 
cgit v1.2.3