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/hw/xquartz/pbproxy | |
| 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/hw/xquartz/pbproxy')
| -rw-r--r-- | xorg-server/hw/xquartz/pbproxy/app-main.m | 6 | ||||
| -rw-r--r-- | xorg-server/hw/xquartz/pbproxy/main.m | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/xorg-server/hw/xquartz/pbproxy/app-main.m b/xorg-server/hw/xquartz/pbproxy/app-main.m index 4e61c05a3..097994555 100644 --- a/xorg-server/hw/xquartz/pbproxy/app-main.m +++ b/xorg-server/hw/xquartz/pbproxy/app-main.m @@ -39,9 +39,9 @@ CFStringRef app_prefs_domain_cfstr; /* Stubs */
char *display = NULL;
-BOOL serverInitComplete = YES;
-pthread_mutex_t serverInitCompleteMutex = PTHREAD_MUTEX_INITIALIZER;
-pthread_cond_t serverInitCompleteCond = PTHREAD_COND_INITIALIZER;
+BOOL serverRunning = YES;
+pthread_mutex_t serverRunningMutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_cond_t serverRunningCond = PTHREAD_COND_INITIALIZER;
static void signal_handler (int sig) {
switch(sig) {
diff --git a/xorg-server/hw/xquartz/pbproxy/main.m b/xorg-server/hw/xquartz/pbproxy/main.m index bae23dada..f8450587e 100644 --- a/xorg-server/hw/xquartz/pbproxy/main.m +++ b/xorg-server/hw/xquartz/pbproxy/main.m @@ -47,17 +47,17 @@ BOOL xpbproxy_is_standalone = NO; x_selection *_selection_object;
-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);
}
}
|