From e6575fb1db57b01173421b219628f2ae0a65742c Mon Sep 17 00:00:00 2001 From: curt Date: Wed, 24 May 2000 04:10:01 +0000 Subject: [PATCH] MSVC5 portability changes contributed by Bruce Finney. --- simgear/ephemeris/stars.cxx | 3 +++ simgear/sky/sphere.cxx | 6 +++--- simgear/sky/stars.cxx | 4 ++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/simgear/ephemeris/stars.cxx b/simgear/ephemeris/stars.cxx index 4ff128b5..dcfb5901 100644 --- a/simgear/ephemeris/stars.cxx +++ b/simgear/ephemeris/stars.cxx @@ -26,6 +26,9 @@ #include "stars.hxx" +#ifdef _MSC_VER + FG_USING_STD(getline); +#endif // Constructor FGStars::FGStars() { diff --git a/simgear/sky/sphere.cxx b/simgear/sky/sphere.cxx index fc20bee1..d9732c8e 100644 --- a/simgear/sky/sphere.cxx +++ b/simgear/sky/sphere.cxx @@ -27,7 +27,7 @@ #endif #include - +#include // return a sphere object as an ssgBranch ssgBranch *ssgMakeSphere( ssgSimpleState *state, ssgColourArray *cl, @@ -61,8 +61,8 @@ ssgBranch *ssgMakeSphere( ssgSimpleState *state, ssgColourArray *cl, // accept value as given to us in } - drho = M_PI / (float) stacks; - dtheta = 2.0 * M_PI / (float) slices; + drho = FG_PI / (float) stacks; + dtheta = 2.0 * FG_PI / (float) slices; /* texturing: s goes from 0.0/0.25/0.5/0.75/1.0 at +y/+x/-y/-x/+y axis t goes from -1.0/+1.0 at z = -radius/+radius (linear along diff --git a/simgear/sky/stars.cxx b/simgear/sky/stars.cxx index 2b194b7f..bc709ccf 100644 --- a/simgear/sky/stars.cxx +++ b/simgear/sky/stars.cxx @@ -37,6 +37,10 @@ #include "stars.hxx" +#ifdef _MSC_VER +FG_USING_STD(cout); +FG_USING_STD(endl); +#endif // Set up star rendering call backs static int sgStarPreDraw( ssgEntity *e ) { -- 2.39.5