"Curtis L. Olson" wrote:
> Update of /var/cvs/FlightGear-0.9/source/src/Network
> In directory baron:/tmp/cvs-serv347
> 
> Modified Files:
>       net_ctrls.hxx net_fdm.hxx 
> Log Message:
> 32 bit integers are somewhat magical and handled pretty well across platforms
> in terms of predictable packing and byte ordering.

Now, as a first step of 'least intrusive' simplification would people
agree on this patch ?

--- FlightGear/src/Network/net_ctrls.hxx~       2005-05-06 12:15:48.879996000 
+0200
+++ FlightGear/src/Network/net_ctrls.hxx        2005-05-06 12:15:48.880005000 
+0200
@@ -21,15 +21,11 @@
 
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
-#elif defined( _MSC_VER ) || defined(__MINGW32__)
-typedef signed char      int8_t;
+#elif defined( _MSC_VER ) || defined(__MINGW32__) || defined(sun)
 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
--- FlightGear/src/Network/net_fdm.hxx~ 2005-05-06 12:15:39.099991000 +0200
+++ FlightGear/src/Network/net_fdm.hxx  2005-05-06 12:15:39.110017000 +0200
@@ -23,15 +23,11 @@
 
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
-#elif defined( _MSC_VER ) || defined(__MINGW32__)
-typedef signed char      int8_t;
+#elif defined( _MSC_VER ) || defined(__MINGW32__) || defined(sun)
 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


Martin.
-- 
 Unix _IS_ user friendly - it's just selective about who its friends are !
--------------------------------------------------------------------------

_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@flightgear.org
http://mail.flightgear.org/mailman/listinfo/flightgear-devel
2f585eeea02e2c79d7b1d8c4963bae2d

Reply via email to