* add support for self-contained tags like <test/>

[flightgear.git] / utils / GPSsmooth / MIDG-II.hxx

diff --git a/utils/GPSsmooth/MIDG-II.hxx b/utils/GPSsmooth/MIDG-II.hxx
index cfa5daa55893dbab97afbc03612c027f74dbc121..21ce5856350b01764a3b836bd71c8a641bf00685 100644 (file)
--- a/utils/GPSsmooth/MIDG-II.hxx
+++ b/utils/GPSsmooth/MIDG-II.hxx
@@ -12,23 +12,14 @@
 #include <string>
 #include <vector>
 
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#elif defined( _MSC_VER ) || defined(__MINGW32__) || defined(sun)
-typedef signed short     int16_t;
-typedef signed int       int32_t;
-typedef unsigned short   uint16_t;
-typedef unsigned int     uint32_t;
-#else
-# error "Port me! Platforms that don't have <stdint.h> need to define int8_t, et. al."
-#endif
-
+#include <simgear/misc/stdint.hxx>
 #include <simgear/io/iochannel.hxx>
+#include <simgear/serial/serial.hxx>
 
-SG_USING_STD(cout);
-SG_USING_STD(endl);
-SG_USING_STD(string);
-SG_USING_STD(vector);
+using std::cout;
+using std::endl;
+using std::string;
+using std::vector;
 
 
 // encapsulate a midg integer time (fixme, assumes all times in a track
@@ -143,6 +134,8 @@ public:
     // returns id # if a valid message found.
     int next_message( SGIOChannel *ch, SGIOChannel *log,
                       MIDGpos *pos, MIDGatt *att );
+    int next_message( SGSerialPort *serial, SGIOChannel *log,
+                      MIDGpos *pos, MIDGatt *att );
 
     // load the named file into internal buffers
     bool load( const string &file );