diff --git a/dix/dispatch.c b/dix/dispatch.c index 81a160e11..968bba1be 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -104,6 +104,9 @@ Equipment Corporation. #include "windowstr.h" #include #include + +#include "os/osdep.h" + #include "dixfontstr.h" #include "gcstruct.h" #include "selection.h" diff --git a/include/os.h b/include/os.h index 6355fc5e1..07ffde7ec 100644 --- a/include/os.h +++ b/include/os.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); 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 + +#include "os/osdep.h" + #include "dix.h" #include "os.h" diff --git a/os/osdep.h b/os/osdep.h index 2999884c4..677756624 100644 --- a/os/osdep.h +++ b/os/osdep.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);