Properly compile kln89 code without reliance on ATCDCL.

diff --git a/src/ATC/atcutils.hxx b/src/ATC/atcutils.hxx
index fddb78570e12bb865066ea96ecfc11ac49e734aa..d2d2366a0271aa08d57ba2dbb6199a4adbaaec93 100644 (file)
--- a/src/ATC/atcutils.hxx
+++ b/src/ATC/atcutils.hxx
@@ -52,7 +52,8 @@
 #if !ENABLE_ATCDCL
 
 class SGPath;
-struct ATCData;
+
+
 
 // Possible types of ATC type that the radios may be tuned to.
 // INVALID implies not tuned in to anything.
@@ -67,6 +68,18 @@ enum atc_type {
   INVALID       /* must be last element;  see ATC_NUM_TYPES */
 };
 
+struct ATCData {
+        ATCData() : type(INVALID), cart(0, 0, 0), freq(0), range(0) {}
+       atc_type type;
+       SGGeod geod;
+       SGVec3d cart;
+       unsigned short int freq;
+       unsigned short int range;
+       std::string ident;
+       std::string name;
+};
+
+
 
 // A list of ATC stations
 typedef std::list < ATCData > comm_list_type;

diff --git a/src/Instrumentation/KLN89/kln89_page_apt.cxx b/src/Instrumentation/KLN89/kln89_page_apt.cxx
index 96cceea0d0c6c21e48b6295010bdba6f5aa22dd6..9166db43a0a03dbd20a7b1fa3599d78c308c90e1 100644 (file)
--- a/src/Instrumentation/KLN89/kln89_page_apt.cxx
+++ b/src/Instrumentation/KLN89/kln89_page_apt.cxx
@@ -26,7 +26,11 @@
 #endif
 
 #include "kln89_page_apt.hxx"
-#include <ATCDCL/commlist.hxx>
+#if ENABLE_ATCDCL
+#    include <ATCDCL/commlist.hxx>
+#else
+  #include <ATC/atcutils.hxx>
+#endif
 #include <Main/globals.hxx>
 #include <Airports/runways.hxx>
 #include <Airports/simple.hxx>