From: James Turner <zakalawe@mac.com>
Date: Sun, 6 May 2012 23:59:28 +0000 (+0100)
Subject: Fix SID class ambiguity on Windows (clashes with winnt.h)
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b09298765659035ac521a3f3847f2a70b7cd6f86;p=flightgear.git

Fix SID class ambiguity on Windows (clashes with winnt.h)
---

diff --git a/src/Autopilot/route_mgr.cxx b/src/Autopilot/route_mgr.cxx
index 80313d70a..964f1354c 100644
--- a/src/Autopilot/route_mgr.cxx
+++ b/src/Autopilot/route_mgr.cxx
@@ -1025,7 +1025,7 @@ void FGRouteMgr::setSID(const char* aIdent)
 {
   FGAirport* apt = _plan->departureAirport();
   if (!apt || (aIdent == NULL)) {
-    _plan->setSID((SID*) NULL);
+    _plan->setSID((flightgear::SID*) NULL);
     return;
   } 
   
@@ -1035,7 +1035,7 @@ void FGRouteMgr::setSID(const char* aIdent)
     string sidIdent = ident.substr(0, hyphenPos);
     string transIdent = ident.substr(hyphenPos + 1);
     
-    SID* sid = apt->findSIDWithIdent(sidIdent);
+    flightgear::SID* sid = apt->findSIDWithIdent(sidIdent);
     Transition* trans = sid ? sid->findTransitionByName(transIdent) : NULL;
     _plan->setSID(trans);
   } else {