xserver: Branch 'master'

[GitLab Mirror]

 include/os.h |    3 ---
 os/access.c  |    7 -------
 2 files changed, 10 deletions(-)

New commits:
commit 0f37f6fb4cb9157d953786ef3cb417e1fcce54e4
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Wed Feb 28 20:40:34 2024 +0100

    os: drop unused GetAccessControl()
    
    This function isn't used anywhere, not even in (known) modules/drivers.
    So we can remove it.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1343>

diff --git a/include/os.h b/include/os.h
index 5c43fdde0..8a6fd0516 100644
--- a/include/os.h
+++ b/include/os.h
@@ -427,9 +427,6 @@ GetClientFd(ClientPtr);
 extern _X_EXPORT Bool
 ClientIsLocal(ClientPtr client);
 
-extern _X_EXPORT int
-GetAccessControl(void);
-
 extern _X_EXPORT void
 AddLocalHosts(void);
 
diff --git a/os/access.c b/os/access.c
index ef6147f03..2192fb7d0 100644
--- a/os/access.c
+++ b/os/access.c
@@ -1645,13 +1645,6 @@ ChangeAccessControl(ClientPtr client, int fEnabled)
     return Success;
 }
 
-/* returns FALSE if xhost + in effect, else TRUE */
-int
-GetAccessControl(void)
-{
-    return AccessEnabled;
-}
-
 int
 GetClientFd(ClientPtr client)
 {