Fixes for IA-64 with Intel compiler.

diff --git a/simgear/compiler.h b/simgear/compiler.h
index 7896c4a31a0319e80a3f233ad8f6aa82336aca3f..e80b1826d2fc1cf18f379aff5ab5d8d4b439da2f 100644 (file)
--- a/simgear/compiler.h
+++ b/simgear/compiler.h
@@ -346,7 +346,7 @@
 //
 // Intel C++ Compiler
 //
-#if defined(__ICC)
+#if defined(__ICC) || defined (__ECC)
 #  define SG_NAMESPACES
 #  define SG_HAVE_STD
 #  define SG_HAVE_STREAMBUF

diff --git a/simgear/io/sg_binobj.cxx b/simgear/io/sg_binobj.cxx
index 146765c5ff4980c8cb6d97dc86a969b0b9b8acdc..86c0fba2b13d1d257c1602b4fcf443d2c041a456 100644 (file)
--- a/simgear/io/sg_binobj.cxx
+++ b/simgear/io/sg_binobj.cxx
@@ -346,11 +346,12 @@ bool SGBinObject::read_bin( const string& file ) {
        return false;
     }
 
-    // read creation time
-    time_t calendar_time;
-    sgReadLong( fp, &calendar_time );
+    // read calender time
+    unsigned int foo_calendar_time;
+    sgReadUInt( fp, &foo_calendar_time );
 
 #if 0
+    time_t calendar_time = foo_calendar_time;
     // The following code has a global effect on the host application
     // and can screws up the time elsewhere.  It should be avoided
     // unless you need this for debugging in which case you should