diff options
| author | Keith Packard <keithp@keithp.com> | 2009-12-11 09:22:22 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-12-11 09:22:22 -0800 |
| commit | d3e054ac07dae12a82ad764b0622fddbef4b9ec5 (patch) | |
| tree | ebab8e7ba6ac4052e191de65105d658b5393bf62 /dix | |
| parent | 12fb31815db9de9c01f2d4155a2b74531777c0bf (diff) | |
| parent | 97a6454ea57587db490873fee8ff0f899882972d (diff) | |
Merge remote branch 'jeremyhu/master'
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/dix/main.c b/dix/main.c index 2117a1ee7..d4db90c75 100644 --- a/dix/main.c +++ b/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[]) |