Sync. w. JSBSim CVS

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

diff --git a/src/Network/net_gui.hxx b/src/Network/net_gui.hxx
index 7652ceb7d3f4d9964433c5f2726308b9f58e245c..1025d6acc07d603450a91fb092a625efcb129e94 100644 (file)
--- a/src/Network/net_gui.hxx
+++ b/src/Network/net_gui.hxx
@@ -11,6 +11,7 @@
 #ifndef _NET_GUI_HXX
 #define _NET_GUI_HXX
 
+#include <simgear/misc/stdint.hxx>
 
 // NOTE: this file defines an external interface structure.  Due to
 // variability between platforms and architectures, we only used fixed
@@ -18,22 +19,8 @@
 // I am not aware of any platforms that don't use 4 bytes for float
 // and 8 bytes for double.
 
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#elif defined( _MSC_VER ) || defined(__MINGW32__)
-typedef signed char      int8_t;
-typedef signed short     int16_t;
-typedef signed int       int32_t;
-typedef signed __int64   int64_t;
-typedef unsigned char    uint8_t;
-typedef unsigned short   uint16_t;
-typedef unsigned int     uint32_t;
-typedef unsigned __int64 uint64_t;
-#else
-# error "Port me! Platforms that don't have <stdint.h> need to define int8_t, et. al."
-#endif
 
-const uint16_t FG_NET_GUI_VERSION = 6;
+const uint32_t FG_NET_GUI_VERSION = 7;
 
 
 // Define a structure containing the top level flight dynamics model
@@ -49,7 +36,7 @@ public:
         FG_MAX_TANKS = 4
     };
 
-    uint16_t version;          // increment when data values change
+    uint32_t version;          // increment when data values change
 
     // Positions
     double longitude;          // geodetic (radians)
@@ -65,7 +52,7 @@ public:
     float climb_rate;          // feet per second
 
     // Consumables
-    uint8_t num_tanks;         // Max number of fuel tanks
+    uint32_t num_tanks;                // Max number of fuel tanks
     float fuel_quantity[FG_MAX_TANKS];
 
     // Environment
@@ -77,7 +64,7 @@ public:
     // Approach
     float tuned_freq;           // currently tuned frequency
     float nav_radial;           // target nav radial
-    uint8_t in_range;           // tuned navaid is in range?
+    uint32_t in_range;           // tuned navaid is in range?
     float dist_nm;              // distance to tuned navaid in nautical miles
     float course_deviation_deg; // degrees off target course
     float gs_deviation_deg;     // degrees off target glide slope