mirror of
https://github.com/X11Libre/xserver.git
synced 2026-04-13 21:02:13 +00:00
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:49f77fff14Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net> Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1373> (cherry picked from commit6cb599f59c)
This commit is contained in:
committed by
Alan Coopersmith
parent
2321632c44
commit
48490209d2
@@ -104,6 +104,9 @@ Equipment Corporation.
|
||||
#include "windowstr.h"
|
||||
#include <X11/fonts/fontstruct.h>
|
||||
#include <X11/fonts/libxfont2.h>
|
||||
|
||||
#include "os/osdep.h"
|
||||
|
||||
#include "dixfontstr.h"
|
||||
#include "gcstruct.h"
|
||||
#include "selection.h"
|
||||
|
||||
@@ -302,14 +302,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);
|
||||
|
||||
|
||||
@@ -49,6 +49,9 @@ SOFTWARE.
|
||||
#endif
|
||||
|
||||
#include <X11/keysym.h>
|
||||
|
||||
#include "os/osdep.h"
|
||||
|
||||
#include "dix.h"
|
||||
#include "os.h"
|
||||
|
||||
|
||||
@@ -224,6 +224,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);
|
||||
|
||||
Reference in New Issue
Block a user