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/ftp.scm?id=f8953bea858f894b406eed4a0aca0cd4c4d8671d'>tree</a><a href='/guix/commit/gnu/packages/ftp.scm?id=f8953bea858f894b406eed4a0aca0cd4c4d8671d'>commit</a><a href='/guix/diff/gnu/packages/ftp.scm?id=f8953bea858f894b406eed4a0aca0cd4c4d8671d'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/ftp.scm'>
<input type='hidden' name='id' value='f8953bea858f894b406eed4a0aca0cd4c4d8671d'/><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=f8953bea858f894b406eed4a0aca0cd4c4d8671d'>root</a>/<a href='/guix/log/gnu?id=f8953bea858f894b406eed4a0aca0cd4c4d8671d'>gnu</a>/<a href='/guix/log/gnu/packages?id=f8953bea858f894b406eed4a0aca0cd4c4d8671d'>packages</a>/<a href='/guix/log/gnu/packages/ftp.scm?id=f8953bea858f894b406eed4a0aca0cd4c4d8671d'>ftp.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/ftp.scm?id=f8953bea858f894b406eed4a0aca0cd4c4d8671d&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-10-07 13:54:50 +0200'>2020-10-07</span></td><td><a href='/guix/commit/gnu/packages/ftp.scm?id=2450ccb4b58ecc7305c50ad60fa653c82ba620e3'>gnu: filezilla: Run the test.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/ftp.scm (filezilla)[native-inputs]: Add cppunit.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2020-10-07 13:54:50 +0200'>2020-10-07</span></td><td><a href='/guix/commit/gnu/packages/ftp.scm?id=0eca1c5de4782392715c859791a127ad4cf952d1'>gnu: libfilezilla: Don't build static library.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/ftp.scm (libfilezilla)[arguments]: Add ‘--disable-static’
to #:configure-flags.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2020-10-07 13:54:50 +0200'>2020-10-07</span></td><td><a href='/guix/commit/gnu/packages/ftp.scm?id=df7ebbd9bd7c430ee396295ddde1ba32f45af246'>gnu: filezilla, libfilezilla: Update to 3.50.0, 0.24.1.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/ftp.scm (libfilezilla): Update to 0.24.1.
[native-inputs]: Add gettext-minimal.
[inputs]: Add gnutls.
(filezilla): Update to 3.50.0.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2020-08-16 03:47:13 +0200'>2020-08-16</span></td><td><a href='/guix/commit/gnu/packages/ftp.scm?id=3a4a5be1700a24e2700f9d256212348dfc05c4d7'>gnu: lftp: Update to 4.9.2.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/ftp.scm (lftp): Update to 4.9.2.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>