xserver: Branch 'master'

[GitLab Mirror]

 hw/xwayland/xwayland-glamor.h |    2 ++
 hw/xwayland/xwayland-window.h |    3 +++
 2 files changed, 5 insertions(+)

New commits:
commit 24171bb71010a90f1ac323be49121c1503658567
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Thu Feb 23 08:40:15 2023 +0100

    xwayland: Include <sys/type.h> where needed
    
    With the addition of linux_dmabuf v4, the code adds dev_t in various
    places but did not include <sys/types.h>.
    
    While that works on glibc, it may fail to build on other libc
    implementations such as musl libc.
    
    Make sure to explicitly include <sys/types.h> where we use dev_t.
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1445
    Fixes: bddfe190de - Implement linux_dmabuf_feedback event handlers

diff --git a/hw/xwayland/xwayland-glamor.h b/hw/xwayland/xwayland-glamor.h
index ed9ec40de..aed65b50f 100644
--- a/hw/xwayland/xwayland-glamor.h
+++ b/hw/xwayland/xwayland-glamor.h
@@ -28,6 +28,8 @@
 
 #include <xwayland-config.h>
 
+#include <sys/types.h>
+
 #include <wayland-client.h>
 
 #include "xwayland-types.h"
diff --git a/hw/xwayland/xwayland-window.h b/hw/xwayland/xwayland-window.h
index 2e8313f56..c5c42f097 100644
--- a/hw/xwayland/xwayland-window.h
+++ b/hw/xwayland/xwayland-window.h
@@ -28,8 +28,11 @@
 
 #include <xwayland-config.h>
 
+#include <sys/types.h>
+
 #include <stdio.h>
 #include <unistd.h>
+
 #include <X11/X.h>
 #include <dix.h>
 #include <propertyst.h>