From 6cb599f59c18a1204e13dc0c75dd9e50c4c2697a Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 7 Mar 2024 12:44:04 +0100
Subject: [PATCH] os: unexport OsLookupColor()

It's an internal function, only used by DIX, not by drivers and shouldn't
have been exported in the first place.

Fixes: 49f77fff1495c0a2050fb18f9b1fc627839bbfc2
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1373>
---
 dix/dispatch.c | 1 +
 include/os.h   | 8 --------
 os/oscolor.c   | 3 +++
 os/osdep.h     | 8 ++++++++
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/dix/dispatch.c b/dix/dispatch.c
index 6411a5389..fc0470501 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -110,6 +110,7 @@ Equipment Corporation.
 #include "dix/registry_priv.h"
 #include "dix/screenint_priv.h"
 #include "os/auth.h"
+#include "os/osdep.h"
 
 #include "windowstr.h"
 #include "dixfontstr.h"
diff --git a/include/os.h b/include/os.h
index 848330760..08a546878 100644
--- a/include/os.h
+++ b/include/os.h
@@ -283,14 +283,6 @@ LockServer(void);
 extern _X_EXPORT void
 UnlockServer(void);
 
-extern _X_EXPORT Bool
-OsLookupColor(int /*screen */ ,
-              char * /*name */ ,
-              unsigned /*len */ ,
-              unsigned short * /*pred */ ,
-              unsigned short * /*pgreen */ ,
-              unsigned short * /*pblue */ );
-
 extern _X_EXPORT void
 OsInit(void);
 
diff --git a/os/oscolor.c b/os/oscolor.c
index 5f55b25fb..996d684d8 100644
--- a/os/oscolor.c
+++ b/os/oscolor.c
@@ -49,6 +49,9 @@ SOFTWARE.
 #endif
 
 #include <X11/keysym.h>
+
+#include "os/osdep.h"
+
 #include "dix.h"
 #include "os.h"
 
diff --git a/os/osdep.h b/os/osdep.h
index b6120eef2..fbe320c71 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -166,6 +166,14 @@ void AutoResetServer(int sig);
 /* clone fd so it gets out of our select mask */
 int os_move_fd(int fd);
 
+/* lookup builtin color by name */
+Bool OsLookupColor(int screen,
+                   char *name,
+                   unsigned len,
+                   unsigned short *pred,
+                   unsigned short *pgreen,
+                   unsigned short *pblue);
+
 /* set signal mask - either on current thread or whole process,
    depending on whether multithreading is used */
 int xthread_sigmask(int how, const sigset_t *set, sigset_t *oldest);