summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
authorJeremy Huddleston Sequoia <jeremyhu@apple.com>2016-09-19 00:21:44 -0700
committerJeremy Huddleston Sequoia <jeremyhu@apple.com>2016-09-22 14:55:02 -0700
commit7d6ebf3f4e4d517bb846d15a5deb131da19a267c (patch)
treeb9fcd39fc63c759671d2af105af1fbeb5a6eece5 /dix
parent8bc4727f475321a8adcbbd859f3f8dd9eeb64aa4 (diff)
XQuartz: Adopt input_lock() and input_unlock()
This allows us to remove darwinEvents_lock() and darwinEvents_unlock() and remove the serverRunning hack from dix Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Diffstat (limited to 'dix')
-rw-r--r--dix/main.c21
1 files changed, 0 insertions, 21 deletions
diff --git a/dix/main.c b/dix/main.c
index 0fa561e18..4947062a5 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -120,12 +120,6 @@ Equipment Corporation.
extern void Dispatch(void);
-#ifdef XQUARTZ
-BOOL serverRunning;
-pthread_mutex_t serverRunningMutex = PTHREAD_MUTEX_INITIALIZER;
-pthread_cond_t serverRunningCond = PTHREAD_COND_INITIALIZER;
-#endif
-
CallbackListPtr RootWindowFinalizeCallback = NULL;
int
@@ -286,27 +280,12 @@ dix_main(int argc, char *argv[], char *envp[])
}
}
-#ifdef XQUARTZ
- /* Let the other threads know the server is done with its init */
- pthread_mutex_lock(&serverRunningMutex);
- serverRunning = TRUE;
- pthread_cond_broadcast(&serverRunningCond);
- pthread_mutex_unlock(&serverRunningMutex);
-#endif
-
NotifyParentProcess();
InputThreadInit();
Dispatch();
-#ifdef XQUARTZ
- /* Let the other threads know the server is no longer running */
- pthread_mutex_lock(&serverRunningMutex);
- serverRunning = FALSE;
- pthread_mutex_unlock(&serverRunningMutex);
-#endif
-
UndisplayDevices();
DisableAllDevices();