Irix Mips compiler tweaks.

diff --git a/src/Input/fgjs.cxx b/src/Input/fgjs.cxx
index a17d71a2b30dbcaa336283259d59e30e69982ee3..5745aa4d89a8deac9d1f96ed881d8c976754e674 100644 (file)
--- a/src/Input/fgjs.cxx
+++ b/src/Input/fgjs.cxx
@@ -202,6 +202,3 @@ int main(void) {
      
   return 1;
 }      
-  
-
-

diff --git a/src/Input/input.cxx b/src/Input/input.cxx
index 2f27e938b3ffc9086bc0a29b918e4870f6871aaa..43cf0037c5bbcde7b62c9d4e7344c9e35984b86d 100644 (file)
--- a/src/Input/input.cxx
+++ b/src/Input/input.cxx
@@ -570,7 +570,8 @@ FGInput::_init_joystick ()
     //
     // Initialize the axes.
     //
-    for (int j = 0; j < naxes; j++) {
+    int j;
+    for (j = 0; j < naxes; j++) {
       const SGPropertyNode * axis_node = js_node->getChild("axis", j);
       if (axis_node == 0) {
        SG_LOG(SG_INPUT, SG_INFO, "No bindings for axis " << j);
@@ -592,7 +593,7 @@ FGInput::_init_joystick ()
     //
     // Initialize the buttons.
     //
-    for (int j = 0; j < nbuttons; j++) {
+    for (j = 0; j < nbuttons; j++) {
       const SGPropertyNode * button_node = js_node->getChild("button", j);
       if (button_node == 0) {
        SG_LOG(SG_INPUT, SG_INFO, "No bindings for button " << j);
@@ -630,7 +631,10 @@ FGInput::_update_joystick ()
   float js_val, diff;
   float axis_values[MAX_AXES];
 
-  for (int i = 0; i < MAX_JOYSTICKS; i++) {
+  int i;
+  int j;
+
+  for ( i = 0; i < MAX_JOYSTICKS; i++) {
 
     jsJoystick * js = _joystick_bindings[i].js;
     if (js == 0 || js->notWorking())
@@ -640,7 +644,7 @@ FGInput::_update_joystick ()
 
 
                                // Fire bindings for the axes.
-    for (int j = 0; j < _joystick_bindings[i].naxes; j++) {
+    for ( j = 0; j < _joystick_bindings[i].naxes; j++) {
       axis &a = _joystick_bindings[i].axes[j];
       
                                // Do nothing if the axis position
@@ -658,7 +662,7 @@ FGInput::_update_joystick ()
     }
 
                                // Fire bindings for the buttons.
-    for (int j = 0; j < _joystick_bindings[i].nbuttons; j++) {
+    for (j = 0; j < _joystick_bindings[i].nbuttons; j++) {
       bool pressed = ((buttons & (1 << j)) > 0);
       button &b = _joystick_bindings[i].buttons[j];
 

diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index 3d965546f6be7751b1260f77c38da7cfc1c46d43..cedd772ac3bb3e215dff1aa6e0d292cc19fc0408 100644 (file)
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -16,8 +16,10 @@
 #include "fg_commands.hxx"
 
 SG_USING_STD(string);
+#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(ifstream);
 SG_USING_STD(ofstream);
+#endif
 
 #include "fg_props.hxx"
 #include "fg_io.hxx"