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>
ddac71bd663e5e9c98e'>tree</a><a href='/guix/commit/guix.scm?id=fcb0109d091622e756781ddac71bd663e5e9c98e'>commit</a><a href='/guix/diff/guix.scm?id=fcb0109d091622e756781ddac71bd663e5e9c98e'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/guix.scm'>
<input type='hidden' name='id' value='fcb0109d091622e756781ddac71bd663e5e9c98e'/><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=fcb0109d091622e756781ddac71bd663e5e9c98e'>root</a>/<a href='/guix/log/guix.scm?id=fcb0109d091622e756781ddac71bd663e5e9c98e'>guix.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/guix.scm?id=fcb0109d091622e756781ddac71bd663e5e9c98e&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2014-08-15 16:26:28 +0200'>2014-08-15</span></td><td><a href='/guix/commit/guix.scm?id=b9b8607824448cd6bd152ca0ede460a7f44f3b2b'>Add (guix monad-repl).</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/monad-repl.scm: New file.
* guix.scm: Add it.
* Makefile.am (MODULES): Add it.
* doc/guix.texi (The Store Monad): Document it.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2014-05-20 23:37:11 +0200'>2014-05-20</span></td><td><a href='/guix/commit/guix.scm?id=29decd1f368e769ac176822c0b5e0d54e056b7d2'>Augment (guix).</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix.scm (%public-modules): Add 'monads' and 'gexp'.
</span></span></td><td>Ludovic Courtès</td></tr>