diff options
Diffstat (limited to 'xorg-server/dix')
| -rw-r--r-- | xorg-server/dix/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xorg-server/dix/main.c b/xorg-server/dix/main.c index f96245a4b..d4db90c75 100644 --- a/xorg-server/dix/main.c +++ b/xorg-server/dix/main.c @@ -127,6 +127,8 @@ BOOL serverInitComplete = FALSE; pthread_mutex_t serverInitCompleteMutex = PTHREAD_MUTEX_INITIALIZER; pthread_cond_t serverInitCompleteCond = PTHREAD_COND_INITIALIZER; +int dix_main(int argc, char *argv[], char *envp[]); + int dix_main(int argc, char *argv[], char *envp[]) #else int main(int argc, char *argv[], char *envp[]) @@ -168,7 +170,6 @@ int main(int argc, char *argv[], char *envp[]) InitBlockAndWakeupHandlers(); /* Perform any operating system dependent initializations you'd like */ OsInit(); - config_init(); if(serverGeneration == 1) { CreateWellKnownSockets(); @@ -254,6 +255,7 @@ int main(int argc, char *argv[], char *envp[]) InitRootWindow(WindowTable[i]); InitCoreDevices(); + config_init(); InitInput(argc, argv); InitAndStartDevices(); |