diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-23 12:38:03 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-23 12:38:03 +0000 |
| commit | 98a78a31883c4b5d63dd1465b4208bcc7c12bfcb (patch) | |
| tree | fdb125ad89bd8b0fae5c3580558989367f666f2b /xorg-server/mi | |
| parent | 215417a52a66f9a2252c64f24e417297eba2331f (diff) | |
| parent | ae87f2594b9439cb63a6b52e42e09504b687aea3 (diff) | |
| download | vcxsrv-98a78a31883c4b5d63dd1465b4208bcc7c12bfcb.tar.gz vcxsrv-98a78a31883c4b5d63dd1465b4208bcc7c12bfcb.tar.bz2 vcxsrv-98a78a31883c4b5d63dd1465b4208bcc7c12bfcb.zip | |
merge ^/branches/released .
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 538329827..73f814ef2 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
|