From 65b30abf59d38cb970012d5b1623c1d5bc901953 Mon Sep 17 00:00:00 2001
From: fayjf <fayjf@7f0cb862-5218-0410-a997-914c9d46530a>
Date: Mon, 5 Sep 2011 12:56:50 +0000
Subject: [PATCH] Fixing the "XRANDR" version testing in "freeglut_gamemode.c",
 addressing bug 3383843.  Thanks to Diederick Niehorster for pointing it out.

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@935 7f0cb862-5218-0410-a997-914c9d46530a
---
 freeglut/freeglut/src/freeglut_gamemode.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/freeglut/freeglut/src/freeglut_gamemode.c b/freeglut/freeglut/src/freeglut_gamemode.c
index e590385..deeb63f 100644
--- a/freeglut/freeglut/src/freeglut_gamemode.c
+++ b/freeglut/freeglut/src/freeglut_gamemode.c
@@ -58,7 +58,8 @@ 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 && ver_minor >= 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
      * else changes video mode between our query the current information and
@@ -104,7 +105,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_MINOR >= 1
+#if ( RANDR_MAJOR >= 1 ) || ( ( RANDR_MAJOR == 1 ) && ( RANDR_MINOR >= 1 ) )
         if(rate <= 0) {
             fgState.GameModeRefresh = XRRConfigCurrentRate(xrr_config);
         }
@@ -133,7 +134,7 @@ static int xrandr_resize(int xsz, int ysz, int rate, int just_checking)
             break;
         }
 
-#if RANDR_MAJOR >= 1 && RANDR_MINOR >= 1
+#if ( RANDR_MAJOR >= 1 ) || ( ( RANDR_MAJOR == 1 ) && ( RANDR_MINOR >= 1 ) )
         if(use_rate)
             result = XRRSetScreenConfigAndRate(fgDisplay.Display, xrr_config,
                     fgDisplay.RootWindow, res_idx, rot, rate, timestamp);
@@ -193,7 +194,7 @@ static void fghRememberState( void )
             fgDisplay.prev_ysz = ssizes[curr].height;
             fgDisplay.prev_refresh = -1;
 
-#       if RANDR_MAJOR >= 1 && RANDR_MINOR >= 1
+#       if ( RANDR_MAJOR >= 1 ) || ( ( RANDR_MAJOR == 1 ) && ( RANDR_MINOR >= 1 ) )
             if(fgState.GameModeRefresh != -1) {
                 fgDisplay.prev_refresh = XRRConfigCurrentRate(xrr_config);
             }