Irix/MIPS compiler fixes.

diff --git a/src/Input/fgjs.cxx b/src/Input/fgjs.cxx
index 15fc46ce0d47476f44422749faaed4eb11de2a1a..a17d71a2b30dbcaa336283259d59e30e69982ee3 100644 (file)
--- a/src/Input/fgjs.cxx
+++ b/src/Input/fgjs.cxx
@@ -18,13 +18,19 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+#include <simgear/compiler.h>
+
+#include <math.h>
+
+#include STL_IOSTREAM
+#include STL_FSTREAM
+#include STL_STRING
 
 #include <jssuper.h>
 #include <jsinput.h>
-#include <iostream>
-#include <fstream>
-#include <math.h>
-#include <string>
+
+SG_USING_STD(string);
+
 
 string axes_humannames[8] = { "elevator", "ailerons", "rudder", "throttle", 
                               "mixture","propller pitch", "lateral view", 

diff --git a/src/Input/input.cxx b/src/Input/input.cxx
index 039a52e534f4aef0028f4077af918d82eea3bcc0..b126b2feb27b9a1a012f26cdf70df1b63597cef3 100644 (file)
--- a/src/Input/input.cxx
+++ b/src/Input/input.cxx
@@ -67,7 +67,9 @@
 
 #include "input.hxx"
 
+#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(ifstream);
+#endif
 SG_USING_STD(string);
 SG_USING_STD(vector);