aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/os/osinit.c
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-02-27 04:08:51 +0100
committerMihai Moldovan <ionic@ionic.de>2017-02-27 04:08:51 +0100
commit0a5d26d121a8420feb25bd68c8f1623edf50e0a8 (patch)
tree104d1f0ff7e856a3c2e54433046e52346e80d356 /nx-X11/programs/Xserver/os/osinit.c
parente1f2902bb1ad29f852f97dc08a3e3e29ad88c384 (diff)
parentfff875549f70b5f16f9e15cb8fdb4022939bf806 (diff)
downloadnx-libs-0a5d26d121a8420feb25bd68c8f1623edf50e0a8.tar.gz
nx-libs-0a5d26d121a8420feb25bd68c8f1623edf50e0a8.tar.bz2
nx-libs-0a5d26d121a8420feb25bd68c8f1623edf50e0a8.zip
Merge branch 'sunweaver-pr/hard-code-rgb-colors' into 3.6.x
Attributes GH PR #319: https://github.com/ArcticaProject/nx-libs/pull/319
Diffstat (limited to 'nx-X11/programs/Xserver/os/osinit.c')
-rw-r--r--nx-X11/programs/Xserver/os/osinit.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/os/osinit.c b/nx-X11/programs/Xserver/os/osinit.c
index 59b567356..adafa3cf4 100644
--- a/nx-X11/programs/Xserver/os/osinit.c
+++ b/nx-X11/programs/Xserver/os/osinit.c
@@ -88,8 +88,6 @@ int limitStackSpace = -1;
int limitNoFile = -1;
#endif
-Bool OsDelayInitColors = FALSE;
-
void
OsInit(void)
{
@@ -218,7 +216,6 @@ OsInit(void)
if (!SmartScheduleInit ())
SmartScheduleDisable = TRUE;
OsInitAllocator();
- if (!OsDelayInitColors) OsInitColors();
}
void