summaryrefslogtreecommitdiff
path: root/dix/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'dix/main.c')
-rw-r--r--dix/main.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/dix/main.c b/dix/main.c
index 05dcbeddd..bbed32241 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -110,6 +110,7 @@ Equipment Corporation.
#else
#include "dixevents.h" /* InitEvents() */
#endif
+#include "dixmain.h"
#ifdef DPMSExtension
#include <X11/extensions/dpmsconst.h>
@@ -159,8 +160,6 @@ dix_main(int argc, char *argv[], char *envp[])
DPMSPowerLevel = 0;
#endif
InitBlockAndWakeupHandlers();
- /* Perform any operating system dependent initializations you'd like */
- OsInit();
if (serverGeneration == 1) {
CreateWellKnownSockets();
for (i = 1; i < MAXCLIENTS; i++)
@@ -172,6 +171,8 @@ dix_main(int argc, char *argv[], char *envp[])
}
else
ResetWellKnownSockets();
+ /* Perform any operating system dependent initializations you'd like */
+ OsInit();
clients[0] = serverClient;
currentMaxClients = 1;