frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xwayland: Do not include sys/eventfd.h without DRI3 

Now that we won't enable DRI3 if <sys/eventfd.h> is not available, there
is not point in trying to include that header without DRI3.

That allows to build Xwayland with GLAMOR enabled (without DRI3) on
platforms which do not support eventfd.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1523>
This commit is contained in:
Olivier Fourdan 2024-08-01 14:18:48 +02:00
parent 96bdc156a1
commit 23c295ea8b
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xwayland/xwayland-glamor-gbm.c
View File

@ -33,7 +33,9 @@
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <poll.h> #include <poll.h>
#ifdef DRI3
#include <sys/eventfd.h> #include <sys/eventfd.h>
#endif /* DRI3 */
#include <sys/stat.h> #include <sys/stat.h>
#include <xf86drm.h> #include <xf86drm.h>
#include <drm_fourcc.h> #include <drm_fourcc.h>

2
hw/xwayland/xwayland-present.c
View File

@ -31,7 +31,9 @@
#endif #endif
#include <windowstr.h> #include <windowstr.h>
#include <present.h> #include <present.h>
#ifdef DRI3
#include <sys/eventfd.h> #include <sys/eventfd.h>
#endif /* DRI3 */
#include "xwayland-present.h" #include "xwayland-present.h"
#include "xwayland-screen.h" #include "xwayland-screen.h"

2
hw/xwayland/xwayland-window-buffers.c
View File

@ -39,7 +39,9 @@
#include "dri3.h" #include "dri3.h"
#include <poll.h> #include <poll.h>
#ifdef DRI3
#include <sys/eventfd.h> #include <sys/eventfd.h>
#endif
#include "linux-drm-syncobj-v1-client-protocol.h" #include "linux-drm-syncobj-v1-client-protocol.h"
#define BUFFER_TIMEOUT 1 * 1000 /* ms */ #define BUFFER_TIMEOUT 1 * 1000 /* ms */