David Fries:

Fixes for 64bit systems

diff --git a/utils/js_server/js_server.cxx b/utils/js_server/js_server.cxx
index 620b4b57e5ea9c6922cce7c3fb0c2ff29d4cca2b..64a3422ba9adee7f0e4ee3a087a6f9df5c9bca44 100644 (file)
--- a/utils/js_server/js_server.cxx
+++ b/utils/js_server/js_server.cxx
@@ -67,7 +67,7 @@ int main ( int argc, char ** argv )
   ax = new float [ numaxes ] ;
   activeaxes = numaxes;
   
-  if( numaxes < 4 )
+  if( numaxes > 4 )
   {
     printf("max 4 axes joysticks supported at the moment, however %i axes were detected\nWill only use the first 4 axes!\n", numaxes);
     activeaxes = 4;
@@ -101,17 +101,17 @@ int main ( int argc, char ** argv )
         js->read( &b, ax );
        for ( axis = 0 ; axis < activeaxes ; axis++ )
        {
-         long axisvalue = (long int)(ax[axis]*2147483647.0);
-         printf("axisval=%li\n", axisvalue);
-         memcpy(packet+len, &axisvalue, 4);
-         len+=4;
+         int32_t axisvalue = (int32_t)(ax[axis]*2147483647.0);
+         printf("axisval=%li\n", (long)axisvalue);
+         memcpy(packet+len, &axisvalue, sizeof(axisvalue));
+         len+=sizeof(axisvalue);
        }
        // fill emtpy values into packes when less than 4 axes
        for( ; axis < 4; axis++ )
        {
-         long axisvalue = 0;
-         memcpy(packet+len, &axisvalue, 4);
-         len+=4;
+         int32_t axisvalue = 0;
+         memcpy(packet+len, &axisvalue, sizeof(axisvalue));
+         len+=sizeof(axisvalue);
        }
 
        long int b_l = b;