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: 49f77fff14
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1373>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-03-07 12:44:04 +01:00 committed by Alan Coopersmith
parent 2b7a2f8ed2
commit 6cb599f59c
4 changed files with 12 additions and 8 deletions

View File

@ -110,6 +110,7 @@ Equipment Corporation.
#include "dix/registry_priv.h" #include "dix/registry_priv.h"
#include "dix/screenint_priv.h" #include "dix/screenint_priv.h"
#include "os/auth.h" #include "os/auth.h"
#include "os/osdep.h"
#include "windowstr.h" #include "windowstr.h"
#include "dixfontstr.h" #include "dixfontstr.h"

View File

@ -283,14 +283,6 @@ LockServer(void);
extern _X_EXPORT void extern _X_EXPORT void
UnlockServer(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 extern _X_EXPORT void
OsInit(void); OsInit(void);

View File

@ -49,6 +49,9 @@ SOFTWARE.
#endif #endif
#include <X11/keysym.h> #include <X11/keysym.h>
#include "os/osdep.h"
#include "dix.h" #include "dix.h"
#include "os.h" #include "os.h"

View File

@ -166,6 +166,14 @@ void AutoResetServer(int sig);
/* clone fd so it gets out of our select mask */ /* clone fd so it gets out of our select mask */
int os_move_fd(int fd); 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, /* set signal mask - either on current thread or whole process,
depending on whether multithreading is used */ depending on whether multithreading is used */
int xthread_sigmask(int how, const sigset_t *set, sigset_t *oldest); int xthread_sigmask(int how, const sigset_t *set, sigset_t *oldest);