MSVC5 portability changes contributed by Bruce Finney.

diff --git a/simgear/ephemeris/stars.cxx b/simgear/ephemeris/stars.cxx
index 4ff128b557b3a6fa1799f3ec31156572f4adf672..dcfb5901e126065b1f39f4ece1fad5532c257582 100644 (file)
--- a/simgear/ephemeris/stars.cxx
+++ b/simgear/ephemeris/stars.cxx
@@ -26,6 +26,9 @@
 
 #include "stars.hxx"
 
 
 #include "stars.hxx"
 

+#ifdef _MSC_VER
+  FG_USING_STD(getline);
+#endif

 
 // Constructor
 FGStars::FGStars() {
 
 // Constructor
 FGStars::FGStars() {

diff --git a/simgear/sky/sphere.cxx b/simgear/sky/sphere.cxx
index fc20bee13bf2bc8ff1da135911e6de87a927c7f2..d9732c8e5b08fee990345f70b34d9236fc9a3aba 100644 (file)
--- a/simgear/sky/sphere.cxx
+++ b/simgear/sky/sphere.cxx
@@ -27,7 +27,7 @@
 #endif
 
 #include <plib/ssg.h>
 #endif
 
 #include <plib/ssg.h>

-
+#include <simgear/constants.h>

 
 // return a sphere object as an ssgBranch
 ssgBranch *ssgMakeSphere( ssgSimpleState *state, ssgColourArray *cl,
 
 // 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
     }
 
        // 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
 
     /* 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 2b194b7f8db11cae06a43477811fab6cd232ee5c..bc709ccf3ce1d9b14a7b8fe13031ed8f80d00be6 100644 (file)
--- a/simgear/sky/stars.cxx
+++ b/simgear/sky/stars.cxx
@@ -37,6 +37,10 @@
 
 #include "stars.hxx"
 
 
 #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 ) {
 
 // Set up star rendering call backs
 static int sgStarPreDraw( ssgEntity *e ) {