xserver: Branch 'master'

[GitLab Mirror]

 dix/dix_priv.h |    3 +++
 dix/window.c   |    1 +
 include/dix.h  |    2 --
 3 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit b064b7913266349e5ed1938769449a43787d0ae8
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Mar 7 16:10:16 2024 +0100

    dix: unexport DeleteWindowFromAnySaveSet()
    
    Not used by any drivers, so no need to export it.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1378>

diff --git a/dix/dix_priv.h b/dix/dix_priv.h
index e3527a30e..d20373108 100644
--- a/dix/dix_priv.h
+++ b/dix/dix_priv.h
@@ -17,6 +17,7 @@
 #include <X11/Xfuncproto.h>
 
 #include "include/dix.h"
+#include "include/window.h"
 
 /* server setting: maximum size for big requests */
 #define MAX_BIG_REQUEST_SIZE 4194303
@@ -49,4 +50,6 @@ Bool dixLookupBuiltinColor(int screen,
                            unsigned short *pgreen,
                            unsigned short *pblue);
 
+void DeleteWindowFromAnySaveSet(WindowPtr pWin);
+
 #endif /* _XSERVER_DIX_PRIV_H */
diff --git a/dix/window.c b/dix/window.c
index 8a5144eae..27929de14 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -100,6 +100,7 @@ Equipment Corporation.
 #include <dix-config.h>
 #endif
 
+#include "dix/dix_priv.h"
 #include "os/auth.h"
 
 #include "misc.h"
diff --git a/include/dix.h b/include/dix.h
index e3fdddede..a50b2da1c 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -211,8 +211,6 @@ extern _X_EXPORT int AlterSaveSetForClient(ClientPtr /*client */ ,
                                            Bool /*toRoot */ ,
                                            Bool /*map */ );
 
-extern _X_EXPORT void DeleteWindowFromAnySaveSet(WindowPtr /*pWin */ );
-
 extern _X_EXPORT void BlockHandler(void *timeout);
 
 extern _X_EXPORT void WakeupHandler(int result);