[Freeglut-cvs] SF.net SVN: freeglut:[1436] tags/FG_2_8_1_RC1/freeglut/src/ freeglut_gamemode.c

[<dc...@us...>]

Revision: 1436
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1436&view=rev
Author:   dcnieho
Date:     2012-11-19 09:27:20 +0000 (Mon, 19 Nov 2012)
Log Message:
-----------
backporting r1380

Revision Links:
--------------
    http://freeglut.svn.sourceforge.net/freeglut/?rev=1380&view=rev

Modified Paths:
--------------
    tags/FG_2_8_1_RC1/freeglut/src/freeglut_gamemode.c

Modified: tags/FG_2_8_1_RC1/freeglut/src/freeglut_gamemode.c
===================================================================
--- tags/FG_2_8_1_RC1/freeglut/src/freeglut_gamemode.c	2012-11-19 09:24:30 UTC (rev 1435)
+++ tags/FG_2_8_1_RC1/freeglut/src/freeglut_gamemode.c	2012-11-19 09:27:20 UTC (rev 1436)
@@ -58,7 +58,7 @@
     /* 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
@@ -105,7 +105,7 @@
         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;
 
@@ -130,7 +130,7 @@
             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.Display, xrr_config,
                     fgDisplay.RootWindow, res_idx, rot, rate, timestamp);
@@ -190,7 +190,7 @@
             fgDisplay.prev_ysz = ssizes[curr].height;
             fgDisplay.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.prev_refresh = XRRConfigCurrentRate(xrr_config);
             }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.