Fix Win32 compilation - avoid SID name clash with windows.h

diff --git a/src/Airports/simple.cxx b/src/Airports/simple.cxx
index f563cf1d0a72ab1a113a9af6cdc06c6ae8036447..c7e486f45a56b95cd0ddac27e5179fe9d7a22fa7 100644 (file)
--- a/src/Airports/simple.cxx
+++ b/src/Airports/simple.cxx
@@ -511,13 +511,13 @@ bool FGAirport::buildApproach(Waypt* aEnroute, STAR* aSTAR, FGRunway* aRwy, Wayp
   return aps.front()->routeFromVectors(aRoute);
 }
 
-pair<SID*, WayptRef>
+pair<flightgear::SID*, WayptRef>
 FGAirport::selectSID(const SGGeod& aDest, FGRunway* aRwy)
 {
   loadProcedures();
   
   WayptRef enroute;
-  SID* sid = NULL;
+  flightgear::SID* sid = NULL;
   double d = 1e9;
   
   for (unsigned int i=0; i<mSIDs.size(); ++i) {
@@ -580,7 +580,7 @@ FGAirport::selectSTAR(const SGGeod& aOrigin, FGRunway* aRwy)
 }
 
 
-void FGAirport::addSID(SID* aSid)
+void FGAirport::addSID(flightgear::SID* aSid)
 {
   mSIDs.push_back(aSid);
 }
@@ -601,13 +601,13 @@ unsigned int FGAirport::numSIDs() const
   return mSIDs.size();
 }
 
-SID* FGAirport::getSIDByIndex(unsigned int aIndex) const
+flightgear::SID* FGAirport::getSIDByIndex(unsigned int aIndex) const
 {
   loadProcedures();
   return mSIDs[aIndex];
 }
 
-SID* FGAirport::findSIDWithIdent(const std::string& aIdent) const
+flightgear::SID* FGAirport::findSIDWithIdent(const std::string& aIdent) const
 {
   loadProcedures();
   for (unsigned int i=0; i<mSIDs.size(); ++i) {

diff --git a/src/Autopilot/route_mgr.cxx b/src/Autopilot/route_mgr.cxx
index 1896946fce76c7a2ccd37909cd3d7c8ff2563773..fac7dc628f39ee84d32ffc54de37226d040fad15 100644 (file)
--- a/src/Autopilot/route_mgr.cxx
+++ b/src/Autopilot/route_mgr.cxx
@@ -468,7 +468,7 @@ void FGRouteMgr::autoRoute()
     
   _route.clear(); // clear out the existing, first
 // SID
-  SID* sid;
+  flightgear::SID* sid;
   WayptRef sidTrans;
   
   boost::tie(sid, sidTrans) = _departure->selectSID(_destination->geod(), runway);
@@ -569,7 +569,7 @@ void FGRouteMgr::buildDeparture(WayptRef enroute, WayptVec& wps)
   
   FGRunway* r = _departure->getRunwayByIdent(runwayId);
   string sidId = departure->getStringValue("sid");
-  SID* sid = _departure->findSIDWithIdent(sidId);
+  flightgear::SID* sid = _departure->findSIDWithIdent(sidId);
   if (!sid) {
 // valid runway, but no SID selected/found, so just the runway node for now
     if (!sidId.empty() && (sidId != "(none)")) {