X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_joystick.c;h=82fc444eda8ddde2d9e5b242085ea7049a1671dc;hb=3515ebeb3424bf675a8a10f04b61fb6924775e0c;hp=a47d4910e4d40482a7f462e916ec03dd12a79b8b;hpb=646676b8dbf8ab504ac8a275fe9a63a403a3190b;p=freeglut

diff --git a/src/freeglut_joystick.c b/src/freeglut_joystick.c
index a47d491..82fc444 100644
--- a/src/freeglut_joystick.c
+++ b/src/freeglut_joystick.c
@@ -56,8 +56,12 @@
 #else
 #   include <unistd.h>
 #   include <fcntl.h>
-#   ifdef __FreeBSD__
+#   if defined(__FreeBSD__) || defined(__NetBSD__)
+#   if __FreeBSD_version >= 500000
+#       include <sys/joystick.h>
+#   else
 #       include <machine/joystick.h>
+#   endif
 #       define JS_DATA_TYPE joystick
 #       define JS_RETURN (sizeof(struct JS_DATA_TYPE))
 #   elif defined(__linux__)
@@ -247,13 +251,13 @@ 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;
     }
 
     if( buttons )
-#       ifdef __FreeBSD__
+#       if defined(__FreeBSD__) || defined(__NetBSD__)
         *buttons = (joy->js.b1 ? 1 : 0) | (joy->js.b2 ? 2 : 0);
 #       else
         *buttons = joy->js.buttons;
@@ -413,7 +417,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 +505,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 )