Cygwin fixes contributed by Norman Vine.

diff --git a/src/Input/fgjs.cxx b/src/Input/fgjs.cxx
index e9ed0aa72639f3f77482279780617f0cdf87f9f0..59ea34a9b24a262c5c59558e2c913f2c6b7dd921 100644 (file)
--- a/src/Input/fgjs.cxx
+++ b/src/Input/fgjs.cxx
@@ -26,7 +26,6 @@
 #include STL_FSTREAM
 #include STL_STRING
 
-#include <jssuper.h>
 #include <jsinput.h>
 
 SG_USING_STD(string);
@@ -119,7 +118,7 @@ int main(void) {
   jsSuper *jss=new jsSuper();
   jsInput *jsi=new jsInput(jss);
   jsi->displayValues(false);
-  int i;
+  // int i;
   int control=0;
   
   

diff --git a/src/Input/jsinput.cxx b/src/Input/jsinput.cxx
index 48d0d74be1650a9c8a595092bf84f1e838b53ff1..5bf12a4c5ab0d3fb343648f946efc7e8d34e9114 100644 (file)
--- a/src/Input/jsinput.cxx
+++ b/src/Input/jsinput.cxx
@@ -18,11 +18,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-#include <jssuper.h>
 #include <jsinput.h>
-#include <plib/js.h>
-#include <plib/ul.h>
-
 
 jsInput::jsInput(jsSuper *j) {
   jss=j;
@@ -38,7 +34,7 @@ int jsInput::getInput(void){
       bool gotit=false;
       
       float delta;
-      int i,current_button=0,button_bits;       
+      int i, current_button = 0, button_bits = 0;
 
       joystick=axis=button=-1;
       
@@ -113,5 +109,7 @@ int jsInput::getInput(void){
           } 
         }    
       } 
+
+      return 0;
 }
   

diff --git a/src/Input/jsinput.h b/src/Input/jsinput.h
index b173a3a714064a557a533046be89dda61e37b77f..a9a37780d58b033f0bbd983da4967511c5ea9128 100644 (file)
--- a/src/Input/jsinput.h
+++ b/src/Input/jsinput.h
@@ -24,7 +24,6 @@
 #define _JSINPUT_H
 
 #include <jssuper.h>
-#include <plib/js.h>
 
 class jsInput {
   private:

diff --git a/src/Input/jssuper.cxx b/src/Input/jssuper.cxx
index 4e1bf8059753d7c1808e156d8cd2fbe39922b999..49141da12500764e17068735574d0e6806c30f35 100644 (file)
--- a/src/Input/jssuper.cxx
+++ b/src/Input/jssuper.cxx
@@ -19,9 +19,6 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include <string.h>            // plib/js.h should really include this !!!!!!
-#include <plib/js.h>
-
 #include <jssuper.h>
 
 
@@ -51,7 +48,7 @@ jsSuper::jsSuper(void) {
 
 
 int jsSuper::nextJoystick(void) { 
-  int i;
+  // int i;
   if(!activeJoysticks) return 0;
   if(currentJoystick == last ) return 0; 
   currentJoystick++;
@@ -60,7 +57,7 @@ int jsSuper::nextJoystick(void) {
 }    
         
 int jsSuper::prevJoystick(void) { 
-  int i;
+  // int i;
   if(!activeJoysticks) return 0; 
   if(currentJoystick == first ) return 0; 
   currentJoystick--;

diff --git a/src/Input/jssuper.h b/src/Input/jssuper.h
index 356256dfe7bf0989048b165df5125cf6dc5cf4f4..48b7d7f6765ea0bba8451b88ba889b92683fecfb 100644 (file)
--- a/src/Input/jssuper.h
+++ b/src/Input/jssuper.h
@@ -21,6 +21,9 @@
 #ifndef _JSSUPER_H
 #define _JSSUPER_H
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #ifdef HAVE_WINDOWS_H
 #  include <windows.h>