Portability fix

diff --git a/simgear/compatibility/iomanip b/simgear/compatibility/iomanip
index f693dd4e42f066201536c9536e32cfdbf141ab68..97d4ff1e8ef3505771dcaba3f4105e4cd36b96ae 100644 (file)
--- a/simgear/compatibility/iomanip
+++ b/simgear/compatibility/iomanip
@@ -5,7 +5,9 @@
 # include <iomanip.h>
 
 namespace std {
+
    using ::setw;
+   using ::setprecision;
 
    inline int  setfill(int f) { ::setfill(f); }
 };

diff --git a/simgear/nasal/nasal.h b/simgear/nasal/nasal.h
index 417ca67d3438959a775e89c164b8bfe45f7eebf9..0d5ff82883dcb94131d7f44d5f5f662502af8a50 100644 (file)
--- a/simgear/nasal/nasal.h
+++ b/simgear/nasal/nasal.h
@@ -4,6 +4,8 @@
 extern "C" {
 #endif
 
+#define NASAL_BIG_ENDIAN_32_BIT
+
 // This is a nasal "reference".  They are always copied by value, and
 // contain either a pointer to a garbage-collectable nasal object
 // (string, vector, hash) or a floating point number.  Keeping the

diff --git a/simgear/structure/event_mgr.hxx b/simgear/structure/event_mgr.hxx
index 1ae86d135ffbe57463b0cf0aef9f19fc2161fd73..07c65d5faa9a739869de487d6bc2895541de6d86 100644 (file)
--- a/simgear/structure/event_mgr.hxx
+++ b/simgear/structure/event_mgr.hxx
@@ -107,7 +107,7 @@ public:
     { add(make_callback(o,m), 0, delay, false, sim); }
 
 private:
-    friend class SGTimer;
+    friend struct SGTimer;
 
     void add(SGCallback* cb,
              double interval, double delay,