From 4773182c721c45731db4cd119441722d03edb8b9 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Tue, 20 Feb 2024 11:49:57 +0100
Subject: [PATCH] os: unexport LockServer() and UnlockServer() from public
 module API

These functions work on server process level, and shouldn't be touched
by drivers at all, thus shouldn't be exported to them.

(couldn't find any driver/module using these symbols)

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1320>
---
 include/os.h    |  5 -----
 os/osinit.c     |  1 +
 os/serverlock.h | 11 +++++++++++
 os/utils.c      |  1 +
 4 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 os/serverlock.h

diff --git a/include/os.h b/include/os.h
index 3adc1f7c9..105c5e08e 100644
--- a/include/os.h
+++ b/include/os.h
@@ -257,11 +257,6 @@ typedef int (*OsSigWrapperPtr) (int /* sig */ );
 extern _X_EXPORT OsSigWrapperPtr
 OsRegisterSigWrapper(OsSigWrapperPtr newWrap);
 
-extern _X_EXPORT void
-LockServer(void);
-extern _X_EXPORT void
-UnlockServer(void);
-
 extern _X_EXPORT Bool
 PrivsElevated(void);
 
diff --git a/os/osinit.c b/os/osinit.c
index 01bb21743..9a4a5ee7e 100644
--- a/os/osinit.c
+++ b/os/osinit.c
@@ -63,6 +63,7 @@ SOFTWARE.
 #include "dix/dix_priv.h"
 #include "os/busfault.h"
 #include "os/osdep.h"
+#include "os/serverlock.h"
 
 #include "misc.h"
 #include "os.h"
diff --git a/os/serverlock.h b/os/serverlock.h
new file mode 100644
index 000000000..429c3a04b
--- /dev/null
+++ b/os/serverlock.h
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef _XSERVER_SERVERLOCK_H
+#define _XSERVER_SERVERLOCK_H
+
+void LockServer(void);
+void UnlockServer(void);
+
+#endif /* _XSERVER_SERVERLOCK_H */
diff --git a/os/utils.c b/os/utils.c
index c29c085a3..e45683cef 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -110,6 +110,7 @@ __stdcall unsigned long GetTickCount(void);
 #include "os/cmdline.h"
 #include "os/ddx_priv.h"
 #include "os/osdep.h"
+#include "os/serverlock.h"
 
 #include "dixstruct.h"
 #include "xkbsrv.h"