Fixing build with GCC-4.5 http://bugs.gentoo.org/show_bug.cgi?id=317507 Patch written by Philipp --- src/celengine/overlay.h +++ src/celengine/overlay.h @@ -12,6 +12,7 @@ #include #include +#include #include --- src/celmath/mathlib.h +++ src/celmath/mathlib.h @@ -44,11 +44,6 @@ template T radToDeg(T r) return r * 180 / static_cast(PI); } -template T abs(T x) -{ - return (x < 0) ? -x : x; -} - template T square(T x) { return x * x; --- src/celengine/star.cpp +++ src/celengine/star.cpp @@ -10,6 +10,7 @@ #include #include #include +#include #include "celestia.h" #include "astro.h" #include "orbit.h" --- src/celestia/celx_object.cpp +++ src/celestia/celx_object.cpp @@ -773,7 +773,7 @@ static int object_mark(lua_State* l) markAlpha = 1.0f; Color markColorAlpha(0.0f, 1.0f, 0.0f, 0.9f); - markColorAlpha = Color::Color(markColor, markAlpha); + markColorAlpha = Color(markColor, markAlpha); const char* markLabel = celx.safeGetString(6, WrongType, "Fifth argument to object:mark must be a string"); if (markLabel == NULL)