X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2Fnet_gui.hxx;h=d333918239f7c15ed76236613498172546f614c2;hb=206053722eb59b31ed2fb182044f84bac0058f8a;hp=7652ceb7d3f4d9964433c5f2726308b9f58e245c;hpb=f55f96c44abcd1c03c6684cb9ecf171221c44e2a;p=flightgear.git

diff --git a/src/Network/net_gui.hxx b/src/Network/net_gui.hxx
index 7652ceb7d..d33391823 100644
--- 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 = 8;
 
 
 // Define a structure containing the top level flight dynamics model
@@ -49,23 +36,33 @@ public:
         FG_MAX_TANKS = 4
     };
 
-    uint16_t version;		// increment when data values change
+// Note: align fields properly and manually to avoid incompatibilities
+// between 32bit and 64bit CPUs. Make sure that each field is already
+// placed on an offset which is a multiple of the size of its data
+// type, i.e. uint32/float need to have on offset of 4, doubles need
+// an offset of 8. This guarantees that compilers will _not_ add
+// CPU-specific padding bytes. Whenever in doubt about padding rules,
+// check "data structure alignment" in Wikipedia/Google :).
 
-    // Positions
-    double longitude;		// geodetic (radians)
-    double latitude;		// geodetic (radians)
-    float altitude;		// above sea level (meters)
-    float agl;			// above ground level (meters)
-    float phi;			// roll (radians)
-    float theta;		// pitch (radians)
-    float psi;			// yaw or true heading (radians)
+    uint32_t version;           // increment when data values change
+    uint32_t padding1;          // 4 padding bytes, so the next (64bit) var is aligned to 8
+
+    // Positions (note: offset for these doubles is already aligned to 8 - to avoid architecture specific alignments)
+    double longitude;           // geodetic (radians)
+    double latitude;            // geodetic (radians)
+
+    float altitude;             // above sea level (meters)
+    float agl;                  // above ground level (meters)
+    float phi;                  // roll (radians)
+    float theta;                // pitch (radians)
+    float psi;                  // yaw or true heading (radians)
 
     // Velocities
     float vcas;
-    float climb_rate;		// feet per second
+    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 +74,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