aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xquartz/pbproxy/app-main.m
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-05-23 12:38:03 +0000
committermarha <marha@users.sourceforge.net>2011-05-23 12:38:03 +0000
commit98a78a31883c4b5d63dd1465b4208bcc7c12bfcb (patch)
treefdb125ad89bd8b0fae5c3580558989367f666f2b /xorg-server/hw/xquartz/pbproxy/app-main.m
parent215417a52a66f9a2252c64f24e417297eba2331f (diff)
parentae87f2594b9439cb63a6b52e42e09504b687aea3 (diff)
downloadvcxsrv-98a78a31883c4b5d63dd1465b4208bcc7c12bfcb.tar.gz
vcxsrv-98a78a31883c4b5d63dd1465b4208bcc7c12bfcb.tar.bz2
vcxsrv-98a78a31883c4b5d63dd1465b4208bcc7c12bfcb.zip
merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xquartz/pbproxy/app-main.m')
-rw-r--r--xorg-server/hw/xquartz/pbproxy/app-main.m6
1 files changed, 3 insertions, 3 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) {