[Xquartz-changes] xserver: Branch 'master' - 2 commits

[Jeremy Huddleston]

 hw/xquartz/applewm.c       |    2 +-
 hw/xquartz/xpr/xprScreen.c |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit cb5d4b416a0fc850a1c119755a9cc3c4f0d7a545
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Wed Mar 23 12:10:15 2011 -0700

    XQuartz: applewm: Don't check if requested window level is < 0 because it is unsigned (-Wtautological-compare)
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/hw/xquartz/applewm.c b/hw/xquartz/applewm.c
index ec20534..2f26e61 100644
--- a/hw/xquartz/applewm.c
+++ b/hw/xquartz/applewm.c
@@ -437,7 +437,7 @@ ProcAppleWMSetWindowLevel(register ClientPtr client)
 				   DixReadAccess))
         return BadValue;
 
-    if (stuff->level < 0 || stuff->level >= AppleWMNumWindowLevels) {
+    if (stuff->level >= AppleWMNumWindowLevels) {
         return BadValue;
     }
 
commit c116e32dc2799c4abcf38d22bc773b755387c89a
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Wed Mar 23 12:07:36 2011 -0700

    XQuartz: Put ifdef guards around have_depth label (-Wunused-label)
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c
index 972278b..f6a7129 100644
--- a/hw/xquartz/xpr/xprScreen.c
+++ b/hw/xquartz/xpr/xprScreen.c
@@ -326,7 +326,9 @@ xprAddScreen(int index, ScreenPtr pScreen)
 #endif
     }
     
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
 have_depth:
+#endif
     switch(depth) {
         case 8: // pseudo-working
             dfb->visuals = PseudoColorMask;