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>
uix/tree/gnu/packages/cdrom.scm?id=7d33d36c52434f416400c7ef48027b8f7fe68ea3'>tree</a><a href='/guix/commit/gnu/packages/cdrom.scm?id=7d33d36c52434f416400c7ef48027b8f7fe68ea3'>commit</a><a href='/guix/diff/gnu/packages/cdrom.scm?id=7d33d36c52434f416400c7ef48027b8f7fe68ea3'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/cdrom.scm'>
<input type='hidden' name='id' value='7d33d36c52434f416400c7ef48027b8f7fe68ea3'/><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=7d33d36c52434f416400c7ef48027b8f7fe68ea3'>root</a>/<a href='/guix/log/gnu?id=7d33d36c52434f416400c7ef48027b8f7fe68ea3'>gnu</a>/<a href='/guix/log/gnu/packages?id=7d33d36c52434f416400c7ef48027b8f7fe68ea3'>packages</a>/<a href='/guix/log/gnu/packages/cdrom.scm?id=7d33d36c52434f416400c7ef48027b8f7fe68ea3'>cdrom.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/cdrom.scm?id=7d33d36c52434f416400c7ef48027b8f7fe68ea3&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-04-14 19:01:10 +0200'>2019-04-14</span></td><td><a href='/guix/commit/gnu/packages/cdrom.scm?id=9a018b9b938471f8aea66f06324c8167ca08878a'>gnu: Add cdemu-client.</a><span class='msg-avail'>...</span></td><td>Pierre Neidhardt</td></tr>
<tr><td><span title='2019-04-14 19:01:10 +0200'>2019-04-14</span></td><td><a href='/guix/commit/gnu/packages/cdrom.scm?id=ba5c154e962e3cb66b26b59ee1c1143a448cdd8e'>gnu: Add cdemu-daemon.</a><span class='msg-avail'>...</span></td><td>Pierre Neidhardt</td></tr>
<tr><td><span title='2019-04-14 19:01:09 +0200'>2019-04-14</span></td><td><a href='/guix/commit/gnu/packages/cdrom.scm?id=4a22d71af5faaf6b1de4c544c8a7ec0074835f42'>gnu: Add libmirage.</a><span class='msg-avail'>...</span></td><td>Pierre Neidhardt</td></tr>
<tr><td><span title='2019-03-28 20:19:28 +0100'>2019-03-28</span></td><td><a href='/guix/commit/gnu/packages/cdrom.scm?id=6da31b3c7bfcd8f012695574e91d7da32f202280'>gnu: dvdisaster: Use archived source and home page.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-03-24 00:51:19 +0100'>2019-03-24</span></td><td><a href='/guix/commit/gnu/packages/cdrom.scm?id=80a699353be50117a8fc2e03650579b815c30b3f'>gnu: asunder: Update to 2.9.3.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-03-18 15:05:08 +0100'>2019-03-18</span></td><td><a href='/guix/commit/gnu/packages/cdrom.scm?id=47956fa0c24efcdcba3493f0231c30e9a39ec7df'>Correct name and email address for ng0.</a><span class='msg-avail'>...</span></td><td>ng0</td></tr>
<tr><td><span title='2019-02-21 22:17:05 -0600'>2019-02-21</span></td><td><a href='/guix/commit/gnu/packages/cdrom.scm?id=e0611e9a84fdf7954e98ebe21ac8e36dfaf0a707'>gnu: cdrtools: Disable build parallelism.</a><span class='msg-avail'>...</span></td><td>Eric Bavier</td></tr>
<tr><td><span title='2019-02-06 16:49:12 -0500'>2019-02-06</span></td><td><a href='/guix/commit/gnu/packages/cdrom.scm?id=25945666e3dfb7f81e984bb8a3c9ec1d20730558'>gnu: abcde: Update to 2.9.3.</a><span class='msg-avail'>...</span></td><td>Kei Kebreau</td></tr>