From: John Tsiombikas <nuclear@member.fsf.org>
Date: Tue, 31 Jul 2012 14:33:26 +0000 (+0000)
Subject: gamemode-x11: fixed the conditions checking for XR&R >= 1.1, as it where they would... 
X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=commitdiff_plain;h=a3a9bf33c8d3100c09bae73c1f390ac2316529d7;p=freeglut

gamemode-x11: fixed the conditions checking for XR&R >= 1.1, as it where they would match 1.0 too


git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1380 7f0cb862-5218-0410-a997-914c9d46530a
---

diff --git a/src/x11/fg_gamemode_x11.c b/src/x11/fg_gamemode_x11.c
index 6130aeb..cf2299d 100644
--- a/src/x11/fg_gamemode_x11.c
+++ b/src/x11/fg_gamemode_x11.c
@@ -46,7 +46,7 @@ static int xrandr_resize(int xsz, int ysz, int rate, int just_checking)
     /* we only heed the rate if we CAN actually use it (Xrandr >= 1.1) and
      * the user actually cares about it (rate > 0)
      */
-    use_rate = ( rate > 0 ) && ( ( ver_major >= 1 ) ||
+    use_rate = ( rate > 0 ) && ( ( ver_major > 1 ) ||
 		                         ( ( ver_major == 1 ) && ( ver_minor >= 1 ) ) );
 
     /* this loop is only so that the whole thing will be repeated if someone
@@ -93,7 +93,7 @@ static int xrandr_resize(int xsz, int ysz, int rate, int just_checking)
         if(res_idx == -1)
             break;  /* no matching resolution */
 
-#if ( RANDR_MAJOR >= 1 ) || ( ( RANDR_MAJOR == 1 ) && ( RANDR_MINOR >= 1 ) )
+#if ( RANDR_MAJOR > 1 ) || ( ( RANDR_MAJOR == 1 ) && ( RANDR_MINOR >= 1 ) )
         if(use_rate) {
             rate = fgState.GameModeRefresh;
 
@@ -118,7 +118,7 @@ static int xrandr_resize(int xsz, int ysz, int rate, int just_checking)
             break;
         }
 
-#if ( RANDR_MAJOR >= 1 ) || ( ( RANDR_MAJOR == 1 ) && ( RANDR_MINOR >= 1 ) )
+#if ( RANDR_MAJOR > 1 ) || ( ( RANDR_MAJOR == 1 ) && ( RANDR_MINOR >= 1 ) )
         if(use_rate)
             result = XRRSetScreenConfigAndRate(fgDisplay.pDisplay.Display, xrr_config,
                     fgDisplay.pDisplay.RootWindow, res_idx, rot, rate, timestamp);
@@ -176,7 +176,7 @@ void fgPlatformRememberState( void )
             fgDisplay.pDisplay.prev_ysz = ssizes[curr].height;
             fgDisplay.pDisplay.prev_refresh = -1;
 
-#       if ( RANDR_MAJOR >= 1 ) || ( ( RANDR_MAJOR == 1 ) && ( RANDR_MINOR >= 1 ) )
+#       if ( RANDR_MAJOR > 1 ) || ( ( RANDR_MAJOR == 1 ) && ( RANDR_MINOR >= 1 ) )
             if(fgState.GameModeRefresh != -1) {
                 fgDisplay.pDisplay.prev_refresh = XRRConfigCurrentRate(xrr_config);
             }