Tweaks for building with native SGI compilers.

[flightgear.git] / Main / fg_serial.cxx

diff --git a/Main/fg_serial.cxx b/Main/fg_serial.cxx
index 13738d4136d07c915cb9710c20e76ee501f1886c..d0853074cae75054108c405861f653e688837d7f 100644 (file)
--- a/Main/fg_serial.cxx
+++ b/Main/fg_serial.cxx
@@ -33,12 +33,9 @@
 #include STL_STRING
 #include STL_IOSTREAM                                           
 #include <vector>                                                               
-#include "Include/fg_stl_config.h"                                              
 
-FG_USING_NAMESPACE(std);
-
-#include <Aircraft/aircraft.hxx>
 #include <Debug/logstream.hxx>
+#include <Aircraft/aircraft.hxx>
 #include <Include/fg_constants.h>
 #include <Serial/serial.hxx>
 #include <Time/fg_time.hxx>
@@ -47,6 +44,8 @@ FG_USING_NAMESPACE(std);
 
 #include "fg_serial.hxx"
 
+FG_USING_STD(string);
+FG_USING_STD(vector);
 
 // support an arbitrary number of serial channels.  Each channel can
 // be assigned to an arbitrary port.  Bi-directional communication is
@@ -232,7 +231,7 @@ static void send_nmea_out( fgIOCHANNEL *p ) {
     char dir;
     int deg;
     double min;
-    FGState *f;
+    FGInterface *f;
     fgTIME *t;
 
     // run once every two seconds
@@ -331,7 +330,7 @@ static void send_garmin_out( fgIOCHANNEL *p ) {
     char dir;
     int deg;
     double min;
-    FGState *f;
+    FGInterface *f;
     fgTIME *t;
 
     // run once per second
@@ -468,6 +467,15 @@ void fgSerialProcess() {
 
 
 // $Log$
+// Revision 1.13  1999/03/02 01:03:16  curt
+// Tweaks for building with native SGI compilers.
+//
+// Revision 1.12  1999/02/26 22:09:50  curt
+// Added initial support for native SGI compilers.
+//
+// Revision 1.11  1999/02/05 21:29:11  curt
+// Modifications to incorporate Jon S. Berndts flight model code.
+//
 // Revision 1.10  1999/01/21 00:55:01  curt
 // Fixed some problems with timing of output strings.
 // Added checksum support for nmea and garmin output.