MSVC++ fixes.

diff --git a/simgear/metar/MetarStation.cpp b/simgear/metar/MetarStation.cpp
index d7ead145604aa66809cd78b8e6eec9302ead4d5b..927106c030d24ef44ad4808f67b5df09820c2f1f 100644 (file)
--- a/simgear/metar/MetarStation.cpp
+++ b/simgear/metar/MetarStation.cpp
@@ -86,7 +86,7 @@ CMetarStation::CMetarStation(
        double ualtitude = atoi( s ) * FEET_TO_METER;
        Point3D p( longitude, latitude, altitude+EQUATORIAL_RADIUS_M );
        m_locationPolar = p;
-       m_locationCart = fgPolarToCart3d( p );
+       m_locationCart = sgPolarToCart3d( p );
        Point3D up( ulongitude, ulatitude, ualtitude+EQUATORIAL_RADIUS_M );
        m_upperLocationPolar = up;
        m_upperLocationCart = fgPolarToCart3d( up );

diff --git a/simgear/sky/moon.cxx b/simgear/sky/moon.cxx
index c5310fd4b88c38fdb79126223f9bc57950b42cd3..dffbb523b72274aa427dc77af3bc6e9acf993951 100644 (file)
--- a/simgear/sky/moon.cxx
+++ b/simgear/sky/moon.cxx
@@ -29,6 +29,8 @@
 #  include <config.h>
 #endif
 
+#include <simgear/compiler.h>
+
 #include <stdio.h>
 #include <iostream>
 
@@ -88,7 +90,7 @@ static int sgMoonHaloPreDraw( ssgEntity *e ) {
     if ( f -> hasState () ) f->getState()->apply() ;
 
     glPushAttrib( GL_DEPTH_BUFFER_BIT | GL_FOG_BIT | GL_COLOR_BUFFER_BIT);
-    cout << "push error = " << glGetError() << endl;
+    // cout << "push error = " << glGetError() << endl;
 
     glDisable( GL_DEPTH_TEST );
     glDisable( GL_FOG );
@@ -105,7 +107,7 @@ static int sgMoonHaloPostDraw( ssgEntity *e ) {
     // glBlendFunc ( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ) ;
     
     glPopAttrib();
-    cout << "pop error = " << glGetError() << endl;
+    // cout << "pop error = " << glGetError() << endl;
 
     return true;
 }

diff --git a/simgear/xml/easyxml.cxx b/simgear/xml/easyxml.cxx
index 81038fec1a931b043aa12951cca6d6607ddbd6d3..979d0877bc9573ecdfd8d7942f9ee8c1c2e767ea 100644 (file)
--- a/simgear/xml/easyxml.cxx
+++ b/simgear/xml/easyxml.cxx
@@ -1,5 +1,11 @@
 // easyxml.cxx - implementation of EasyXML interfaces.
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include <simgear/compiler.h>
+
 #include "easyxml.hxx"
 #include "xmlparse.h"