xserver: Branch 'master'

[GitLab Mirror]

 damageext/damageext.c |    1 +
 dix/events.c          |    1 +
 include/os.h          |    2 --
 os/client_priv.h      |    1 +
 record/record.c       |    1 +
 5 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit d973c438104941758a80905e8fc6aaa76a43176d
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Wed Feb 19 18:50:34 2025 +0100

    os: unexport SetCriticalOutputPending()
    
    Not used by any drivers/modules, so no need to keep it exported.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1814>

diff --git a/damageext/damageext.c b/damageext/damageext.c
index 5c012bd11..219cdaad2 100644
--- a/damageext/damageext.c
+++ b/damageext/damageext.c
@@ -24,6 +24,7 @@
 #include <dix-config.h>
 
 #include "dix/dix_priv.h"
+#include "os/client_priv.h"
 
 #include "damageextint.h"
 #include "damagestr.h"
diff --git a/dix/events.c b/dix/events.c
index 56572319c..e732fdc30 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -125,6 +125,7 @@ Equipment Corporation.
 #include "dix/eventconvert.h"
 #include "dix/exevents_priv.h"
 #include "os/bug_priv.h"
+#include "os/client_priv.h"
 #include "os/fmt.h"
 #include "xkb/xkbsrv_priv.h"
 
diff --git a/include/os.h b/include/os.h
index 3f2bdfbc0..c28849de1 100644
--- a/include/os.h
+++ b/include/os.h
@@ -86,8 +86,6 @@ typedef struct _NewClientRec *NewClientPtr;
 
 extern _X_EXPORT int ReadFdFromClient(ClientPtr client);
 
-extern _X_EXPORT void SetCriticalOutputPending(void);
-
 extern _X_EXPORT int WriteToClient(ClientPtr /*who */ , int /*count */ ,
                                    const void * /*buf */ );
 
diff --git a/os/client_priv.h b/os/client_priv.h
index 88da283da..c9c534e64 100644
--- a/os/client_priv.h
+++ b/os/client_priv.h
@@ -53,6 +53,7 @@ void NotifyParentProcess(void);
 void CreateWellKnownSockets(void);
 void ResetWellKnownSockets(void);
 void CloseWellKnownConnections(void);
+void SetCriticalOutputPending(void);
 
 /* exported only for DRI module, but should not be used by external drivers */
 _X_EXPORT void ResetCurrentRequest(struct _Client *client);
diff --git a/record/record.c b/record/record.c
index 2909ac84e..d8e730972 100644
--- a/record/record.c
+++ b/record/record.c
@@ -36,6 +36,7 @@ and Jim Haggerty of Metheus.
 
 #include "dix/cursor_priv.h"
 #include "dix/eventconvert.h"
+#include "os/client_priv.h"
 
 #include "dixstruct.h"
 #include "extnsionst.h"