From b64d2e878c93977ae5c155ec574c00c20cf821f9 Mon Sep 17 00:00:00 2001
From: Jonas 'Sortie' Termansen <sortie@maxsi.org>
Date: Mon, 12 Aug 2013 14:37:24 +0200
Subject: Avoid conflict with gamma(3) in utils/vrad/vrad.h.

The name of the global variable conflicts with the deprecated gamma function
from <math.h> on some systems. Additionally the variable appears to be
unused - should it rather just be deleted from the codebase?
---
 mp/src/utils/vrad/vrad.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mp/src/utils/vrad/vrad.cpp')

diff --git a/mp/src/utils/vrad/vrad.cpp b/mp/src/utils/vrad/vrad.cpp
index 854956ec..8100dc3f 100644
--- a/mp/src/utils/vrad/vrad.cpp
+++ b/mp/src/utils/vrad/vrad.cpp
@@ -93,7 +93,7 @@ bool g_bOnlyStaticProps = false;
 bool g_bShowStaticPropNormals = false;
 
 
-float		gamma = 0.5;
+float		gamma_value = 0.5;
 float		indirect_sun = 1.0;
 float		reflectivityScale = 1.0;
 qboolean	do_extra = true;
-- 
cgit v1.2.3