diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-14 10:22:19 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-14 10:22:19 +0000 |
| commit | 9b17452909d3140fa33a753cadfaa6e9006b9685 (patch) | |
| tree | 4abbb4b660ee9125cb0c20dab5a1c8de9f5a4a2d /xorg-server/dix/main.c | |
| parent | 75d2bbcf0f39b9c85bc270728343f61dabebce2d (diff) | |
| download | vcxsrv-9b17452909d3140fa33a753cadfaa6e9006b9685.tar.gz vcxsrv-9b17452909d3140fa33a753cadfaa6e9006b9685.tar.bz2 vcxsrv-9b17452909d3140fa33a753cadfaa6e9006b9685.zip | |
Git update 14/12/2009
Diffstat (limited to 'xorg-server/dix/main.c')
| -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(); |