diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-23 12:30:27 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-23 12:30:27 +0000 |
| commit | ae87f2594b9439cb63a6b52e42e09504b687aea3 (patch) | |
| tree | a0a59232ccde314cb2032d2856f1eb3b8701d3f8 /xorg-server/mi | |
| parent | 52011cfedaa930d61d8f60b283a2051093727582 (diff) | |
| download | vcxsrv-ae87f2594b9439cb63a6b52e42e09504b687aea3.tar.gz vcxsrv-ae87f2594b9439cb63a6b52e42e09504b687aea3.tar.bz2 vcxsrv-ae87f2594b9439cb63a6b52e42e09504b687aea3.zip | |
xserver git update 23 May 2011
Diffstat (limited to 'xorg-server/mi')
| -rw-r--r-- | xorg-server/mi/mieq.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/xorg-server/mi/mieq.c b/xorg-server/mi/mieq.c index 236ffcc3b..031b11ab2 100644 --- a/xorg-server/mi/mieq.c +++ b/xorg-server/mi/mieq.c @@ -83,17 +83,17 @@ static EventQueueRec miEventQueue; #include <pthread.h> static pthread_mutex_t miEventQueueMutex = PTHREAD_MUTEX_INITIALIZER; -extern BOOL serverInitComplete; -extern pthread_mutex_t serverInitCompleteMutex; -extern pthread_cond_t serverInitCompleteCond; +extern BOOL serverRunning; +extern pthread_mutex_t serverRunningMutex; +extern pthread_cond_t serverRunningCond; static inline void wait_for_server_init(void) { /* If the server hasn't finished initializing, wait for it... */ - if(!serverInitComplete) { - pthread_mutex_lock(&serverInitCompleteMutex); - while(!serverInitComplete) - pthread_cond_wait(&serverInitCompleteCond, &serverInitCompleteMutex); - pthread_mutex_unlock(&serverInitCompleteMutex); + if(!serverRunning) { + pthread_mutex_lock(&serverRunningMutex); + while(!serverRunning) + pthread_cond_wait(&serverRunningCond, &serverRunningMutex); + pthread_mutex_unlock(&serverRunningMutex); } } #endif |