Fix crashes (activating the route-manager) with a default GPS.

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

diff --git a/src/Network/native_ctrls.hxx b/src/Network/native_ctrls.hxx
index 9b1b7ba2773d99047c333435fd7b0a2dd4a6eb9c..fe90e79d9509479b545814b58eaddc025cfea6b2 100644 (file)
--- a/src/Network/native_ctrls.hxx
+++ b/src/Network/native_ctrls.hxx
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started July 2001.
 //
-// Copyright (C) 2001  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2001  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -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,15 +27,13 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
-
-#include <Controls/controls.hxx>
+#include <string>
 
+#include <Aircraft/controls.hxx>
 #include "protocol.hxx"
 #include "net_ctrls.hxx"
 
-SG_USING_STD(string);
-
+using std::string;
 
 class FGNativeCtrls : public FGProtocol {
 
@@ -63,10 +61,13 @@ public:
 // Helper functions which may be useful outside this class
 
 // Populate the FGNetCtrls structure from the property tree.
-void FGProps2NetCtrls( FGNetCtrls *net );
+void FGProps2NetCtrls( FGNetCtrls *net, bool honor_freezes,
+                       bool net_byte_order );
 
 // Update the property tree from the FGNetCtrls structure.
-void FGNetCtrls2Props( FGNetCtrls *net );
+void FGNetCtrls2Props( FGNetCtrls *net, bool honor_freezes,
+                       bool net_byte_order );
+
 
 #endif // _FG_NATIVE_CTRLS_HXX