Merge branch 'topics/mainloop' into next

[flightgear.git] / src / Network / garmin.hxx

diff --git a/src/Network/garmin.hxx b/src/Network/garmin.hxx
index 6fd2ad56958fcfe11876895b0364a9df8030d02d..e69d4ab4f868d1088f6fcae17dac8051af6016a5 100644 (file)
--- a/src/Network/garmin.hxx
+++ b/src/Network/garmin.hxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -27,18 +27,18 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include "protocol.hxx"
 
-SG_USING_STD(string);
-
+class FlightProperties;
 
 class FGGarmin : public FGProtocol {
 
     char buf[ FG_MAX_MSG_SIZE ];
     int length;
-
+    FlightProperties* fdm;
+    
 public:
 
     FGGarmin();