xserver: Branch 'master'

[GitLab Mirror]

 include/os.h |    2 --
 os/osdep.h   |    1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 1d7cb4b2c3d4a68867e9c9f7e70e5f971c43ce34
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Fri Mar 8 18:50:25 2024 +0100

    os: unexport CloseDownConnection()
    
    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/1582>

diff --git a/include/os.h b/include/os.h
index 65b961e8c..51be06277 100644
--- a/include/os.h
+++ b/include/os.h
@@ -125,8 +125,6 @@ extern _X_EXPORT const char *ClientAuthorized(ClientPtr /*client */ ,
                                               unsigned int /*string_n */ ,
                                               char * /*auth_string */ );
 
-extern _X_EXPORT void CloseDownConnection(ClientPtr /*client */ );
-
 typedef void (*NotifyFdProcPtr)(int fd, int ready, void *data);
 
 #define X_NOTIFY_NONE   0x0
diff --git a/os/osdep.h b/os/osdep.h
index fdcb083b9..50d72b218 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -201,6 +201,7 @@ void ListenToAllClients(void);
 void ForceClockId(clockid_t forced_clockid);
 
 Bool WaitForSomething(Bool clients_are_ready);
+void CloseDownConnection(ClientPtr client);
 
 extern int LimitClients;
 extern Bool PartialNetwork;