diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-25 08:32:37 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-25 08:32:37 +0200 |
| commit | acf3535c75d7c79154b6b89c66567317944d244c (patch) | |
| tree | 8fcc57fc152d9c594e3119678a6f5d8f0160267b /xorg-server/dix/main.c | |
| parent | 5c340ceb9356ea029dea53b73440268d4769d5a5 (diff) | |
| download | vcxsrv-acf3535c75d7c79154b6b89c66567317944d244c.tar.gz vcxsrv-acf3535c75d7c79154b6b89c66567317944d244c.tar.bz2 vcxsrv-acf3535c75d7c79154b6b89c66567317944d244c.zip | |
xserver mesa git update 25 Jul 2013
xserver commit 43ac0491e36cdbb716b5c9d39c97d0aba3bebd75
mesa commit 8a9df7a370b66ec50b6255e4d66ac1ed331319fb
Diffstat (limited to 'xorg-server/dix/main.c')
| -rw-r--r-- | xorg-server/dix/main.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/xorg-server/dix/main.c b/xorg-server/dix/main.c index e69cd931f..05dcbeddd 100644 --- a/xorg-server/dix/main.c +++ b/xorg-server/dix/main.c @@ -125,14 +125,10 @@ BOOL serverRunning = FALSE; pthread_mutex_t serverRunningMutex = PTHREAD_MUTEX_INITIALIZER; pthread_cond_t serverRunningCond = PTHREAD_COND_INITIALIZER; -int dix_main(int argc, char *argv[], char *envp[]); +#endif int dix_main(int argc, char *argv[], char *envp[]) -#else -int -main(int argc, char *argv[], char *envp[]) -#endif { int i; HWEventQueueType alwaysCheckForInput[2]; |