mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-16 00:19:55 +00:00
Merge remote branch 'jeremyhu/master'
This commit is contained in:
commit
d3e054ac07
6 changed files with 12 additions and 13 deletions
|
|
@ -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[])
|
||||
|
|
|
|||
Loading…
Reference in a new issue