Martin Spott wrote:
> Would anyone object to a patch that unifies this to "(__sun)" ?
Patch2/3:
--- FlightGear/src/AIModel/AIAircraft.cxx~ 2005-10-04 20:23:11.495899550
+0200
+++ FlightGear/src/AIModel/AIAircraft.cxx 2005-10-04 20:23:11.515898800
+0200
@@ -36,7 +36,7 @@
#ifdef _MSC_VER
# include <float.h>
# define finite _finite
-#elif defined(sun) || defined(sgi)
+#elif defined(__sun) || defined(sgi)
# include <ieeefp.h>
#endif
--- FlightGear/src/Cockpit/hud.cxx~ 2005-10-04 20:23:28.446154050 +0200
+++ FlightGear/src/Cockpit/hud.cxx 2005-10-04 20:23:28.466190600 +0200
@@ -58,7 +58,7 @@
#include <Main/fg_props.hxx>
#include <Scenery/scenery.hxx>
-#if defined ( __sun__ ) || defined ( __sgi )
+#if defined (__sun) || defined ( __sgi )
extern "C" {
extern void *memmove(void *, const void *, size_t);
}
--- FlightGear/src/Main/metar_main.cxx~ 2005-10-04 20:23:45.456406450 +0200
+++ FlightGear/src/Main/metar_main.cxx 2005-10-04 20:23:45.466406450 +0200
@@ -31,7 +31,7 @@
using namespace std;
// text color
-#if defined(__linux__) || defined( __sun__ ) || defined(__CYGWIN__) \
+#if defined(__linux__) || defined(__sun) || defined(__CYGWIN__) \
|| defined( __FreeBSD__ ) || defined ( sgi )
# define R "\033[31;1m" // red
# define G "\033[32;1m" // green
--- FlightGear/tests/test-mktime.cxx~ 2005-10-04 20:24:02.016664950 +0200
+++ FlightGear/tests/test-mktime.cxx 2005-10-04 20:24:02.036670850 +0200
@@ -75,7 +75,7 @@
#else // ! defined ( MK_TIME_IS_GMT )
// timezone seems to work as a proper offset for Linux & Solaris
-# if defined( __linux__ ) || defined( __sun__ ) || defined( __CYGWIN__ )
+# if defined( __linux__ ) || defined(__sun) || defined( __CYGWIN__ )
# define TIMEZONE_OFFSET_WORKS 1
# 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
