xserver: Branch 'xorg-server-1.5-apple' - 2 commits

[Jeremy Huddleston]

 hw/xquartz/X11Application.m |    4 ----
 hw/xquartz/X11Controller.h  |    2 ++
 hw/xquartz/X11Controller.m  |    5 ++++-
 3 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 6edce6947bedba4bb29d772e3c1c8733f1a53e85
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Tue Jul 28 22:52:33 2009 -0700

    XQuartz: Avoid a possible spinlock in applicationWillTerminate
    (cherry picked from commit f430cda0fdcc1a8fc5f4795743b40f09ff0bd869)

diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index 9477e94..9900537 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -781,13 +781,16 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row
 
 - (void) applicationWillTerminate:(NSNotification *)aNotification
 {
+  unsigned remain;
   [X11App prefs_synchronize];
 	
   /* shutdown the X server, it will exit () for us. */
   DarwinSendDDXEvent(kXquartzQuit, 0);
 	
   /* In case it doesn't, exit anyway after a while. */
-  while (sleep (10) != 0) ;
+  remain = 10000000;
+  while((remain = usleep(remain)) > 0);
+
   exit (1);
 }
 
commit 3a42b274ad79ebe9c85a41a64afbfc7732345ad0
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Tue Jul 28 13:40:15 2009 -0700

    XQuartz: Avoid namespace collission for BOOL in Sparkle
    (cherry picked from commit 227c6e01a641b72158201553273299283cdb5599)

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index f5fa5ee..7eadc48 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -50,10 +50,6 @@
 #include <unistd.h>
 #include <AvailabilityMacros.h>
 
-#ifdef XQUARTZ_SPARKLE
-#include <Sparkle/SUUpdater.h>
-#endif
-
 #include <Xplugin.h>
 
 // pbproxy/pbproxy.h
diff --git a/hw/xquartz/X11Controller.h b/hw/xquartz/X11Controller.h
index 5b38a11..170bccc 100644
--- a/hw/xquartz/X11Controller.h
+++ b/hw/xquartz/X11Controller.h
@@ -40,7 +40,9 @@
 #include "xpr/x-list.h"
 
 #ifdef XQUARTZ_SPARKLE
+#define BOOL OSX_BOOL
 #include <Sparkle/SUUpdater.h>
+#undef BOOL
 #endif
 
 @interface X11Controller : NSObject