summaryrefslogtreecommitdiff
path: root/include/os.h
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2008-06-11 15:13:21 +0300
committerDaniel Stone <daniel@fooishbar.org>2008-07-16 01:38:22 +0300
commite6f35f28fb3526b911101bde4aa761de8b055aef (patch)
tree60fe7d710722f7c0d0c57a61161caacbe103517b /include/os.h
parent11f9e3520249a603b95e64503ee759998ff17feb (diff)
OS/KDrive/XFree86: Sanitise colour initialisation
OsInitColors always just returned TRUE, so just remove calls to it and insane special-case logic. Remove unused kcolor.c implementation, and merge oscolor.h into oscolor.c since it was the only user. Remove open-coded strncasecmp in oscolor.c. Since we no longer need to call OsInitColors after reading the config file, just call PostConfigInit() from one place, and move PM handling to one place so we can install the signal handlers earlier.
Diffstat (limited to 'include/os.h')
-rw-r--r--include/os.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/os.h b/include/os.h
index 89c624c38..b585fd72a 100644
--- a/include/os.h
+++ b/include/os.h
@@ -93,7 +93,6 @@ typedef struct _NewClientRec *NewClientPtr;
#define SIGVAL void
#endif
-extern Bool OsDelayInitColors;
extern void (*OsVendorVErrorFProc)(const char *, va_list args);
extern int WaitForSomething(
@@ -267,8 +266,6 @@ extern void OsVendorFatalError(void);
extern void OsVendorInit(void);
-extern int OsInitColors(void);
-
void OsBlockSignals (void);
void OsReleaseSignals (void);