xserver: Branch 'master'

[GitLab Mirror]

 hw/xquartz/X11Controller.m      |    2 ++
 hw/xquartz/applewm.c            |    2 +-
 hw/xquartz/darwin.c             |    3 +++
 miext/rootless/rootlessWindow.c |    1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit da0de21b727eb844296640d0878478b874817efd
Author: Aki Sakurai <akisakurai at outlook.com>
Date:   Sun Feb 9 10:11:52 2025 +0800

    xquartz: fix compilation
    
    Fixes #1788
    
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1777>

diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index 4aaa87d06..7e7306895 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -52,6 +52,8 @@
 #include <asl.h>
 #include <stdlib.h>
 
+#include "dix_priv.h"
+
 extern aslclient aslc;
 extern char *bundle_id_prefix;
 
diff --git a/hw/xquartz/applewm.c b/hw/xquartz/applewm.c
index 9a3c71a71..684999749 100644
--- a/hw/xquartz/applewm.c
+++ b/hw/xquartz/applewm.c
@@ -387,7 +387,7 @@ ProcAppleWMSetWindowMenu(register ClientPtr client)
         return BadAlloc;
     }
 
-    max_len = (client->req-len << 2) - sizeof(xAppleWMSetWindowMenuReq);
+    max_len = (client->req_len << 2) - sizeof(xAppleWMSetWindowMenuReq);
     bytes = (char *)&stuff[1];
 
     for (i = j = 0; i < max_len && j < nitems;) {
diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index 45e79b649..fcfcd554a 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -70,6 +70,9 @@
 #define NO_CFPLUGIN
 #include <IOKit/hidsystem/IOHIDLib.h>
 
+#include "input_priv.h"
+#include "screenint_priv.h"
+
 #ifdef MITSHM
 #include "shmint.h"
 #endif
diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c
index 6e22e6bf6..f1cdec307 100644
--- a/miext/rootless/rootlessWindow.c
+++ b/miext/rootless/rootlessWindow.c
@@ -37,6 +37,7 @@
 #include <X11/Xatom.h>
 
 #include "mi/mi_priv.h"
+#include "dix_priv.h"
 
 #ifdef __APPLE__
 #include <Xplugin.h>