From b07612ce2fb3696b12c47f81f193aa5f8123bf56 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Wed, 7 Apr 1999 20:58:02 +0000
Subject: [PATCH] Fixes for compiling with native Irix compilers.

---
 Lib/Bucket/newbucket.hxx      | 3 +++
 Simulator/Airports/simple.hxx | 5 +++++
 Simulator/FDM/flight.hxx      | 2 ++
 Simulator/Scenery/tilemgr.cxx | 2 +-
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Lib/Bucket/newbucket.hxx b/Lib/Bucket/newbucket.hxx
index a616677e3..101ef7ae3 100644
--- 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 d125fdb13..99abb4200 100644
--- 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 99a2e9b81..5afc060c4 100644
--- 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 794eda378..d62a320a0 100644
--- 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;
-- 
2.39.5