svn merge ^/branches/released .

1 files changed, 5 insertions, 5 deletions

diff --git a/xorg-server/hw/xquartz/quartz.c b/xorg-server/hw/xquartz/quartz.c
index 158656b6a..4fdf40c89 100644
--- a/xorg-server/hw/xquartz/quartz.c
+++ b/xorg-server/hw/xquartz/quartz.c
@@ -62,7 +62,7 @@
 #include <sys/stat.h>

 #include <fcntl.h>

 #include <IOKit/pwr_mgt/IOPMLib.h>

-#include <pthread.h>

+#include <libkern/OSAtomic.h>

 #include <signal.h>

 

 #include <rootlessCommon.h>

@@ -279,10 +279,10 @@ static void pokeActivityCallback(CFRunLoopTimerRef timer, void *info) {
 static void QuartzScreenSaver(int state) {

     static CFRunLoopTimerRef pokeActivityTimer = NULL;

     static CFRunLoopTimerContext pokeActivityContext = { 0, NULL, NULL, NULL, NULL };

-    static pthread_mutex_t pokeActivityMutex = PTHREAD_MUTEX_INITIALIZER;

+    static OSSpinLock pokeActivitySpinLock = OS_SPINLOCK_INIT;

+

+    OSSpinLockLock(&pokeActivitySpinLock);

 

-    pthread_mutex_lock(&pokeActivityMutex);

-    

     if(state) {

         if(pokeActivityTimer == NULL)

             goto QuartzScreenSaverEnd;

@@ -303,7 +303,7 @@ static void QuartzScreenSaver(int state) {
         CFRunLoopAddTimer(CFRunLoopGetMain(), pokeActivityTimer, kCFRunLoopCommonModes);

     }

 QuartzScreenSaverEnd:

-    pthread_mutex_unlock(&pokeActivityMutex);

+    OSSpinLockUnlock(&pokeActivitySpinLock);

 }

 

 void QuartzShowFullscreen(int state) {