From 408dcc38b1923c083b6133cac643936cb33aefe2 Mon Sep 17 00:00:00 2001 From: ehofman Date: Sat, 7 May 2005 08:56:42 +0000 Subject: [PATCH] Solaris fixes --- src/AIModel/AIAircraft.cxx | 2 ++ src/Network/net_ctrls.hxx | 6 +----- src/Network/net_fdm.hxx | 6 +----- src/Network/net_gui.hxx | 6 +----- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/AIModel/AIAircraft.cxx b/src/AIModel/AIAircraft.cxx index 80c0879d3..3c73b7825 100644 --- a/src/AIModel/AIAircraft.cxx +++ b/src/AIModel/AIAircraft.cxx @@ -36,6 +36,8 @@ #ifdef _MSC_VER # include # define finite _finite +#elif defined(sun) || defined(sgi) +# include #endif SG_USING_STD(string); diff --git a/src/Network/net_ctrls.hxx b/src/Network/net_ctrls.hxx index f70d4f7b9..05b59367e 100644 --- a/src/Network/net_ctrls.hxx +++ b/src/Network/net_ctrls.hxx @@ -21,15 +21,11 @@ #ifdef HAVE_STDINT_H # include -#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 need to define int8_t, et. al." #endif diff --git a/src/Network/net_fdm.hxx b/src/Network/net_fdm.hxx index f40863248..2164cc8d8 100644 --- a/src/Network/net_fdm.hxx +++ b/src/Network/net_fdm.hxx @@ -23,15 +23,11 @@ #ifdef HAVE_STDINT_H # include -#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 need to define int8_t, et. al." #endif diff --git a/src/Network/net_gui.hxx b/src/Network/net_gui.hxx index d595fbe11..c69a1d291 100644 --- a/src/Network/net_gui.hxx +++ b/src/Network/net_gui.hxx @@ -20,15 +20,11 @@ #ifdef HAVE_STDINT_H # include -#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 need to define int8_t, et. al." #endif