Thierry Thomas said that FreeBSD has no machine/joystick.h, instead a sys/joystick...

[freeglut] / src / freeglut_joystick.c

diff --git a/src/freeglut_joystick.c b/src/freeglut_joystick.c
index a47d491..1c0e321 100644 (file)
--- a/src/freeglut_joystick.c
+++ b/src/freeglut_joystick.c
@@ -57,7 +57,7 @@
 #   include <unistd.h>
 #   include <fcntl.h>
 #   ifdef __FreeBSD__
-#       include <machine/joystick.h>
+#       include <sys/joystick.h>
 #       define JS_DATA_TYPE joystick
 #       define JS_RETURN (sizeof(struct JS_DATA_TYPE))
 #   elif defined(__linux__)
@@ -247,7 +247,7 @@ static void fghJoystickRawRead ( SFG_Joystick* joy, int* buttons, float* axes )
 
     if( status != JS_RETURN )
     {
-        g_warning( joy->fname );
+        fgWarning( "%s", joy->fname );
         joy->error = TRUE;
         return;
     }
@@ -413,7 +413,7 @@ static void fghJoystickOpen( SFG_Joystick* joy )
     if( joy->error )
       return ;
 
-    sprintf( joyfname, "%s/.joy%drc", g_getenv( "HOME" ), joy->id );
+    sprintf( joyfname, "%s/.joy%drc", getenv( "HOME" ), joy->id );
 
     joyfile = fopen( joyfname, "r" );
     joy->error = (joyfile == NULL);
@@ -501,7 +501,7 @@ void fgJoystickInit( int ident )
     /*
      * Have the global joystick structure created
      */
-    fgJoystick = calloc( sizeof(SFG_Joystick), 1 );
+    fgJoystick = (SFG_Joystick *)calloc( sizeof(SFG_Joystick), 1 );
 
 #ifdef WIN32
     switch( ident )