MIPSpro 7.4 fixes

diff --git a/src/FDM/YASim/Makefile.am b/src/FDM/YASim/Makefile.am
index bfe0c96b978f5ebe215a3ff100d24ee4481f35ba..f5bcd17c647cb6d32c24b168dfc169546ba1c8e2 100644 (file)
--- a/src/FDM/YASim/Makefile.am
+++ b/src/FDM/YASim/Makefile.am
@@ -39,6 +39,6 @@ bin_PROGRAMS = yasim
 
 yasim_SOURCES = yasim-test.cpp $(SHARED_SOURCE_FILES)
 
-yasim_LDADD = -lsgxml -lsgprops -lsgdebug -lsgstructure  $(base_LIBS)
+yasim_LDADD = -lsgxml -lsgprops -lsgmisc -lsgdebug -lsgstructure  $(base_LIBS)
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src

diff --git a/src/Network/props.cxx b/src/Network/props.cxx
index da99da9c9c058e329261aa4ebf736c31dd4f42d1..b0526c8ab254a9ec179b2e5cc3446530105e4916 100644 (file)
--- a/src/Network/props.cxx
+++ b/src/Network/props.cxx
@@ -43,10 +43,8 @@
 
 #include "props.hxx"
 
-#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(strstream);
 SG_USING_STD(ends);
-#endif
 
 /**
  * Props connection class.

diff --git a/tests/test-up.cxx b/tests/test-up.cxx
index e9671ee1fd9133a4e9ad85fab53b2f05202544cd..c349d98ea5960d3016c702de26e91ba3062e098c 100644 (file)
--- a/tests/test-up.cxx
+++ b/tests/test-up.cxx
@@ -9,10 +9,8 @@
 #include <simgear/constants.h>
 #include <simgear/math/sg_geodesy.hxx>
 
-#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(cout);
 SG_USING_STD(endl);
-#endif
 
 int main() {
     // for each lat/lon given in goedetic coordinates, calculate

diff --git a/utils/TerraSync/terrasync.cxx b/utils/TerraSync/terrasync.cxx
index e81d89c45e493ae0014367566fff42f297c179dd..96eb8020004122588e49bd3a367da242cd71e0da 100644 (file)
--- a/utils/TerraSync/terrasync.cxx
+++ b/utils/TerraSync/terrasync.cxx
@@ -34,10 +34,8 @@
 #include <simgear/bucket/newbucket.hxx>
 
 SG_USING_STD(string);
-#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(cout);
 SG_USING_STD(endl);
-#endif
 
 static string server = "scenery.flightgear.org";
 static string source_module = "scenery-0.9.2";