summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mi/mieq.c22
1 files changed, 13 insertions, 9 deletions
diff --git a/mi/mieq.c b/mi/mieq.c
index ecedbb354..f68b73b02 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -83,6 +83,19 @@ static EventQueueRec miEventQueue;
#include <pthread.h>
static pthread_mutex_t miEventQueueMutex = PTHREAD_MUTEX_INITIALIZER;
+static inline void queue_mutex_lock(void) {
+ pthread_mutex_lock(&miEventQueueMutex);
+}
+
+static inline void queue_mutex_unlock(void) {
+ pthread_mutex_unlock(&miEventQueueMutex);
+}
+#else
+static inline void queue_mutex_lock(void) {}
+static inline void queue_mutex_unlock(void) {}
+#endif
+
+#if defined XQUARTZ
extern BOOL serverInitComplete;
extern pthread_mutex_t serverInitCompleteMutex;
extern pthread_cond_t serverInitCompleteCond;
@@ -97,17 +110,8 @@ static inline void wait_for_server_init(void) {
}
}
-static inline void queue_mutex_lock(void) {
- pthread_mutex_lock(&miEventQueueMutex);
-}
-
-static inline void queue_mutex_unlock(void) {
- pthread_mutex_unlock(&miEventQueueMutex);
-}
#else
static inline void wait_for_server_init(void) {}
-static inline void queue_mutex_lock(void) {}
-static inline void queue_mutex_unlock(void) {}
#endif
Bool