From b64d2e878c93977ae5c155ec574c00c20cf821f9 Mon Sep 17 00:00:00 2001 From: Jonas 'Sortie' Termansen Date: Mon, 12 Aug 2013 14:37:24 +0200 Subject: [PATCH] Avoid conflict with gamma(3) in utils/vrad/vrad.h. The name of the global variable conflicts with the deprecated gamma function from 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 +- mp/src/utils/vrad/vrad.h | 2 +- sp/src/utils/vrad/vrad.cpp | 2 +- sp/src/utils/vrad/vrad.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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; diff --git a/mp/src/utils/vrad/vrad.h b/mp/src/utils/vrad/vrad.h index b9dc0a3f..b39d66c8 100644 --- a/mp/src/utils/vrad/vrad.h +++ b/mp/src/utils/vrad/vrad.h @@ -336,7 +336,7 @@ extern dface_t *g_pFaces; extern bool g_bMPIProps; extern byte nodehit[MAX_MAP_NODES]; -extern float gamma; +extern float gamma_value; extern float indirect_sun; extern float smoothing_threshold; extern int dlight_map; diff --git a/sp/src/utils/vrad/vrad.cpp b/sp/src/utils/vrad/vrad.cpp index 854956ec..8100dc3f 100644 --- a/sp/src/utils/vrad/vrad.cpp +++ b/sp/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; diff --git a/sp/src/utils/vrad/vrad.h b/sp/src/utils/vrad/vrad.h index b9dc0a3f..b39d66c8 100644 --- a/sp/src/utils/vrad/vrad.h +++ b/sp/src/utils/vrad/vrad.h @@ -336,7 +336,7 @@ extern dface_t *g_pFaces; extern bool g_bMPIProps; extern byte nodehit[MAX_MAP_NODES]; -extern float gamma; +extern float gamma_value; extern float indirect_sun; extern float smoothing_threshold; extern int dlight_map;