From 1bec46dda1388cac995b15ffc118e50e37389be5 Mon Sep 17 00:00:00 2001 From: Aaron Plattner Date: Tue, 24 Jun 2025 10:32:22 -0700 Subject: [PATCH] Revert "os: unexport SetCriticalOutputPending()" The NVIDIA driver uses this function. This reverts commit d973c438104941758a80905e8fc6aaa76a43176d. Signed-off-by: Aaron Plattner --- damageext/damageext.c | 1 - dix/events.c | 1 - include/os.h | 2 ++ os/client_priv.h | 1 - record/record.c | 1 - 5 files changed, 2 insertions(+), 4 deletions(-) diff --git a/damageext/damageext.c b/damageext/damageext.c index 47b7de9c1..c9b14b2ee 100644 --- a/damageext/damageext.c +++ b/damageext/damageext.c @@ -24,7 +24,6 @@ #include #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 d14dfe489..2c99cd29e 100644 --- a/dix/events.c +++ b/dix/events.c @@ -124,7 +124,6 @@ Equipment Corporation. #include "dix/input_priv.h" #include "dix/eventconvert.h" #include "dix/exevents_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 c28849de1..3f2bdfbc0 100644 --- a/include/os.h +++ b/include/os.h @@ -86,6 +86,8 @@ 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 c9c534e64..88da283da 100644 --- a/os/client_priv.h +++ b/os/client_priv.h @@ -53,7 +53,6 @@ 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 fd6d0fd43..e8004a85f 100644 --- a/record/record.c +++ b/record/record.c @@ -36,7 +36,6 @@ and Jim Haggerty of Metheus. #include "dix/cursor_priv.h" #include "dix/eventconvert.h" -#include "os/client_priv.h" #include "os/osdep.h" #include "dixstruct.h"