Solaris fixes

diff --git a/src/AIModel/AIAircraft.cxx b/src/AIModel/AIAircraft.cxx
index 80c0879d32b51ef20c8c020c689012ccaaeb3268..3c73b78258e4064496b99eb020ff80aa5a626738 100644 (file)
--- a/src/AIModel/AIAircraft.cxx
+++ b/src/AIModel/AIAircraft.cxx
@@ -36,6 +36,8 @@
 #ifdef _MSC_VER
 #  include <float.h>
 #  define finite _finite
+#elif defined(sun) || defined(sgi)
+#  include <ieeefp.h>
 #endif
 
 SG_USING_STD(string);

diff --git a/src/Network/net_ctrls.hxx b/src/Network/net_ctrls.hxx
index f70d4f7b9ce9f3dc40f67e8a46f4e81e363da3c1..05b59367eaad1155477abe73d624da29541a0e38 100644 (file)
--- a/src/Network/net_ctrls.hxx
+++ b/src/Network/net_ctrls.hxx
@@ -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

diff --git a/src/Network/net_fdm.hxx b/src/Network/net_fdm.hxx
index f40863248dc693ab615c73af2784a8c6852820db..2164cc8d8c72223e98aeaaabe7bd5c7d19ec2c8d 100644 (file)
--- a/src/Network/net_fdm.hxx
+++ b/src/Network/net_fdm.hxx
@@ -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

diff --git a/src/Network/net_gui.hxx b/src/Network/net_gui.hxx
index d595fbe11b011bddd063a2f0e1f8e77a1e8e6d0f..c69a1d291984977f4ea517edf0e3fb48aa074091 100644 (file)
--- a/src/Network/net_gui.hxx
+++ b/src/Network/net_gui.hxx
@@ -20,15 +20,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