patches/stellarium-02-gcc-name-conflict.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 3577 604651a4ed2b
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name

--- stellarium-0.10.6/src/core/modules/Skybright.cpp.orig	2010-12-05 16:31:00.000000000 +0000
+++ stellarium-0.10.6/src/core/modules/Skybright.cpp	2011-07-03 00:02:22.110227066 +0100
@@ -103,10 +103,10 @@
 
 	// Daylight brightness
 	const float distSun = StelUtils::fastAcos(cosDistSun);
-	const float FS = 18886.28f / (distSun*distSun + 0.0007f)
+	const float _FS = 18886.28f / (distSun*distSun + 0.0007f)
 	               + pow10(6.15f - (distSun+0.001f)* 1.43239f)
 	               + 229086.77f * ( 1.06f + cosDistSun*cosDistSun );
-	const float b_daylight = 9.289663e-12 * (1.f - bKX) * (FS * C4 + 440000.f * (1.f - C4));
+	const float b_daylight = 9.289663e-12 * (1.f - bKX) * (_FS * C4 + 440000.f * (1.f - C4));
 
 	//Twilight brightness
 	const float b_twilight = pow10(bTwilightTerm + 0.063661977f * StelUtils::fastAcos(cosDistZenith)/(K> 0.05f ? K : 0.05f)) * (1.7453293f / distSun) * (1.f-bKX);