Merge branch 'next' of gitorious.org:fg/flightgear into next

[flightgear.git] / src / Airports / apt_loader.hxx

diff --git a/src/Airports/apt_loader.hxx b/src/Airports/apt_loader.hxx
index e96bde6a4958b0d7a8d78999b0488607ad8ea091..7e2405638dffe21c05d866361d4419dac2ccd77c 100644 (file)
--- a/src/Airports/apt_loader.hxx
+++ b/src/Airports/apt_loader.hxx
@@ -25,26 +25,18 @@
 #ifndef _FG_APT_LOADER_HXX
 #define _FG_APT_LOADER_HXX
 
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include <string>
 
-SG_USING_STD(string);
-
-#include "simple.hxx"
-#include "runways.hxx"
-
+// forward decls
+class FGCommList;
 
 // Load the airport data base from the specified aptdb file.  The
 // metar file is used to mark the airports as having metar available
 // or not.
-bool fgAirportDBLoad( FGAirportList *airports, FGRunwayList *runways,
-                      const string &aptdb_file, const string &metar_file );
 
+bool fgAirportDBLoad( const std::string &aptdb_file, 
+        FGCommList *comm_list, const std::string &metar_file );
 
 #endif // _FG_APT_LOADER_HXX