diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2019-11-04 20:03:17 +0100 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2019-11-04 20:49:33 +0100 |
| commit | 741bd73429e337071f49509ddcc5fb392e20b0f6 (patch) | |
| tree | 4a47e39c4f6ebfa7d70abfbf27093b3a6b138fb5 /glamor | |
| parent | 622eea366aaf162479eaabd93c88fa04efe98bcc (diff) | |
glamor/xwayland: Define EGL_NO_X11
Define EGL_NO_X11 everywhere were we also define MESA_EGL_NO_X11_HEADERS,
EGL_NO_X11 is the MESA_EGL_NO_X11_HEADERS equivalent for the egl headers
shipped with libglvnd.
This fixes the xserver not building with the libglvnd-1.2.0 headers:
In file included from /usr/include/EGL/eglplatform.h:128,
from /usr/include/epoxy/egl_generated.h:11,
from /usr/include/epoxy/egl.h:46,
from glamor_priv.h:43,
from glamor_composite_glyphs.c:25:
/usr/include/X11/Xlib.h:222:2: error: conflicting types for 'GC'
222 | *GC;
| ^~
In file included from glamor.h:34,
from glamor_priv.h:32,
from glamor_composite_glyphs.c:25:
../include/gcstruct.h:282:3: note: previous declaration of 'GC' was here
282 | } GC;
| ^~
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'glamor')
| -rw-r--r-- | glamor/glamor_egl.h | 1 | ||||
| -rw-r--r-- | glamor/glamor_priv.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/glamor/glamor_egl.h b/glamor/glamor_egl.h index 2f7566b24..8f6ed7840 100644 --- a/glamor/glamor_egl.h +++ b/glamor/glamor_egl.h @@ -28,6 +28,7 @@ #define GLAMOR_EGL_H #define MESA_EGL_NO_X11_HEADERS +#define EGL_NO_X11 #include <epoxy/gl.h> #include <epoxy/egl.h> #include <glamor_egl_ext.h> diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h index 10c74c1b5..ea7a8bc96 100644 --- a/glamor/glamor_priv.h +++ b/glamor/glamor_priv.h @@ -40,6 +40,7 @@ #include <epoxy/gl.h> #ifdef GLAMOR_HAS_GBM #define MESA_EGL_NO_X11_HEADERS +#define EGL_NO_X11 #include <epoxy/egl.h> #endif |