Fixes for compiling with native Irix compilers.

diff --git a/Lib/Bucket/newbucket.hxx b/Lib/Bucket/newbucket.hxx
index a616677e368c6b6719396b34d126c2a24f94f126..101ef7ae3e28261db86fbe066597cd0781ae7d38 100644 (file)
--- a/Lib/Bucket/newbucket.hxx
+++ b/Lib/Bucket/newbucket.hxx
@@ -39,7 +39,10 @@
 #endif
 
 FG_USING_STD(string);
+
+#if ! defined( FG_HAVE_NATIVE_SGI_COMPILERS )
 FG_USING_STD(ostream);
+#endif
 
 #include <Include/fg_constants.h>
 

diff --git a/Simulator/Airports/simple.hxx b/Simulator/Airports/simple.hxx
index d125fdb1329c672a842e3c066fc68e2a507fc36f..99abb4200ce21244676a1b7a9cd331c1370fbfb9 100644 (file)
--- a/Simulator/Airports/simple.hxx
+++ b/Simulator/Airports/simple.hxx
@@ -36,6 +36,8 @@
 #include <Include/compiler.h>
 #ifdef FG_HAVE_STD_INCLUDES
 #  include <istream>
+#elif defined( FG_HAVE_NATIVE_SGI_COMPILERS )
+#  include <iostream.h>
 #else
 #  include <istream.h>
 #endif
@@ -45,7 +47,10 @@
 
 FG_USING_STD(string);
 FG_USING_STD(set);
+
+#if ! defined( FG_HAVE_NATIVE_SGI_COMPILERS )
 FG_USING_STD(istream);
+#endif
 
 
 class fgAIRPORT {

diff --git a/Simulator/FDM/flight.hxx b/Simulator/FDM/flight.hxx
index 99a2e9b813696cc215e1065c7e3a0ba91aaabd50..5afc060c40c4c1a5e21c97e8c37c5943767c2a8e 100644 (file)
--- a/Simulator/FDM/flight.hxx
+++ b/Simulator/FDM/flight.hxx
@@ -81,6 +81,8 @@
  */
 
 
+#include <math.h>
+
 #include <Time/timestamp.hxx>
 
 #ifndef __cplusplus                                                          

diff --git a/Simulator/Scenery/tilemgr.cxx b/Simulator/Scenery/tilemgr.cxx
index 794eda37822e5aa81bdc0b6b25ed6a6d0e461eed..d62a320a0c53bb9e5b426b973325705c5d66ca23 100644 (file)
--- a/Simulator/Scenery/tilemgr.cxx
+++ b/Simulator/Scenery/tilemgr.cxx
@@ -88,7 +88,7 @@ int fgTileMgrInit( void ) {
 
 
 // load a tile
-void fgTileMgrLoadTile( const FGBucket& p, int *index) {
+void fgTileMgrLoadTile( FGBucket& p, int *index) {
     fgTILECACHE *c;
 
     c = &global_tile_cache;