From b16b4963c1ad81bb9ef784bc4913a4c8ab5f1bb4 Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@gmail.com>
Date: Tue, 12 Sep 2017 14:45:10 -0400
Subject: [PATCH] remove gamma name hack

---
 src/engine/main.cpp | 6 +++---
 src/shared/cube.h   | 8 --------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/engine/main.cpp b/src/engine/main.cpp
index 1032004d..77c9233a 100644
--- a/src/engine/main.cpp
+++ b/src/engine/main.cpp
@@ -278,10 +278,10 @@ static void setgamma(int val)
 }
 
 static int curgamma = 100;
-VARF(IDF_PERSIST, gamma, 30, 100, 300,
+VARFN(IDF_PERSIST, gamma, reqgamma, 30, 100, 300,
 {
-    if(initing || gamma == curgamma) return;
-    curgamma = gamma;
+    if(initing || reqgamma == curgamma) return;
+    curgamma = reqgamma;
     setgamma(curgamma);
 });
 
diff --git a/src/shared/cube.h b/src/shared/cube.h
index 3864c492..7ff5e267 100644
--- a/src/shared/cube.h
+++ b/src/shared/cube.h
@@ -3,19 +3,11 @@
 
 #define _FILE_OFFSET_BITS 64
 
-#ifdef __GNUC__
-#define gamma __gamma
-#endif
-
 #ifdef WIN32
 #define _USE_MATH_DEFINES
 #endif
 #include <math.h>
 
-#ifdef __GNUC__
-#undef gamma
-#endif
-
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
ee/gnu/packages/gps.scm?id=24f57dadc7a38653064eb9a9cd4020abf6c2e033'>tree</a><a href='/guix/commit/gnu/packages/gps.scm?id=24f57dadc7a38653064eb9a9cd4020abf6c2e033'>commit</a><a href='/guix/diff/gnu/packages/gps.scm?id=24f57dadc7a38653064eb9a9cd4020abf6c2e033'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/gps.scm'>
<input type='hidden' name='id' value='24f57dadc7a38653064eb9a9cd4020abf6c2e033'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=24f57dadc7a38653064eb9a9cd4020abf6c2e033'>root</a>/<a href='/guix/log/gnu?id=24f57dadc7a38653064eb9a9cd4020abf6c2e033'>gnu</a>/<a href='/guix/log/gnu/packages?id=24f57dadc7a38653064eb9a9cd4020abf6c2e033'>packages</a>/<a href='/guix/log/gnu/packages/gps.scm?id=24f57dadc7a38653064eb9a9cd4020abf6c2e033'>gps.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/gps.scm?id=24f57dadc7a38653064eb9a9cd4020abf6c2e033&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-06-20 14:02:27 +0200'>2022-06-20</span></td><td><a href='/guix/commit/gnu/packages/gps.scm?id=723d1bbbd2292e65e0adc51b67e625e6f8eb373e'>gnu: gpxsee: Update to 11.1.</a><span class='msg-avail'>...</span></td><td>Nikolay Korotkiy</td></tr>
<tr><td><span title='2022-04-29 01:47:48 +0300'>2022-04-29</span></td><td><a href='/guix/commit/gnu/packages/gps.scm?id=c00906b1dde5bc47d99e7377942f0f091a4fec67'>gnu: gama: Update to 2.19.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2022-04-13 23:53:18 +0300'>2022-04-13</span></td><td><a href='/guix/commit/gnu/packages/gps.scm?id=5743d505834a8b13778da2c969ea4e15bb7a3a75'>gnu: gama: Update to 2.18.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2022-02-08 18:21:31 +0100'>2022-02-08</span></td><td><a href='/guix/commit/gnu/packages/gps.scm?id=97b50ba171c4a06a8228f1f1f3b4ca208afcdb93'>gnu: gpxsee: Update to 10.3.</a><span class='msg-avail'>...</span></td><td>Nikolay Korotkiy via Guix-patches via</td></tr>
<tr><td><span title='2022-01-20 17:49:46 +0200'>2022-01-20</span></td><td><a href='/guix/commit/gnu/packages/gps.scm?id=3e62af6f3b2efcf3181094be79da237ac9208d46'>gnu: gama: Update to 2.17.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2021-12-13 17:48:25 +0100'>2021-12-13</span></td><td><a href='/guix/commit/gnu/packages/gps.scm?id=8394619baceb118df92e355377fd543bb1aa501a'>gnu: Simplify package inputs.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-12-10 21:49:25 +0100'>2021-12-10</span></td><td><a href='/guix/commit/gnu/packages/gps.scm?id=32750e8c3ed38df4cafb39cffa878c6851abc899'>Merge remote-tracking branch 'signed/master' into core-updates</a></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2021-12-10 00:45:53 +0100'>2021-12-10</span></td><td><a href='/guix/commit/gnu/packages/gps.scm?id=1825e4548493051070316e2a12802797e8c72b84'>gnu: gpxsee: Update to 10.0.</a><span class='msg-avail'>...</span></td><td>Nikolay Korotkiy</td></tr>
<tr><td><span title='2021-10-12 17:46:23 +0000'>2021-10-12</span></td><td><a href='/guix/commit/gnu/packages/gps.scm?id=a1eca979fb8da842e73c42f4f53be29b169810f2'>Merge remote-tracking branch 'origin/master' into core-updates-frozen.</a></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2021-10-04 13:31:37 +0200'>2021-10-04</span></td><td><a href='/guix/commit/gnu/packages/gps.scm?id=308ed1dd4459182b70f191a660f57f74c9beb483'>gnu: gpsd: Update to 3.23.1.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-09-25 09:34:29 +0200'>2021-09-25</span></td><td><a href='/guix/commit/gnu/packages/gps.scm?id=a5b2474037d749f42a816c60f0393941ba97444e'>gnu: Consolidate duplicate copyright names.</a><span class='msg-avail'>...</span></td><td>Greg Hogan</td></tr>
<tr><td><span title='2021-09-22 10:59:30 +0300'>2021-09-22</span></td><td><a href='/guix/commit/gnu/packages/gps.scm?id=688c456a67ab9bb1b98593f8fea0e90dc9525da9'>gnu: gama: Update to 2.15.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2021-08-12 00:30:27 +0200'>2021-08-12</span></td><td><a href='/guix/commit/gnu/packages/gps.scm?id=c4133c43c7cfe2476ebfae87f9e4d10d96de9bc7'>Merge branch 'master' into core-updates-frozen</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2021-07-27 12:34:56 -0400'>2021-07-27</span></td><td><a href='/guix/commit/gnu/packages/gps.scm?id=178cbc30d4e4f4a5d718ae220894544709483ef7'>gnu: GPSD: Update to 3.23.</a><span class='msg-avail'>...</span></td><td>Leo Famulari</td></tr>
<tr><td><span title='2021-06-19 17:38:47 +0200'>2021-06-19</span></td><td><a href='/guix/commit/gnu/packages/gps.scm?id=6f9a80b331ae41d142a49fbeb94b90ee587b6155'>Merge branch 'master' into core-updates</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2021-06-14 00:24:42 -0400'>2021-06-14</span></td><td><a href='/guix/commit/gnu/packages/gps.scm?id=ea0a51071e68c37a4c9c25421cf03bc2f442c67b'>gnu: Rename qtbase to qtbase-5.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>