Merge remote branch 'jeremyhu/master'

This commit is contained in:
Keith Packard 2009-12-11 09:22:22 -08:00
commit d3e054ac07
6 changed files with 12 additions and 13 deletions

View file

@ -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[])