FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Partial fixes for bug #1218900 (freeglut-2.4.0 on FreeBSD).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@660 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
spanne 2005-07-02 13:13:30 +00:00
parent f8d3ddc18a
commit 4e334977a1
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freeglut/freeglut/ChangeLog
View File

@ -1090,3 +1090,5 @@ linking troubles for the examples.
(282) Remove wrong "execute" bits when creating a distribution. This (282) Remove wrong "execute" bits when creating a distribution. This
fixes bug #961938 (Executable bit set on non exe files). fixes bug #961938 (Executable bit set on non exe files).
(283) Partial fixes for bug #1218900 (freeglut-2.4.0 on FreeBSD).

8
freeglut/freeglut/src/freeglut_joystick.c
View File

@ -80,7 +80,7 @@
/* XXX The below hack is done until freeglut's autoconf is updated. */ /* XXX The below hack is done until freeglut's autoconf is updated. */
# define HAVE_USB_JS 1 # define HAVE_USB_JS 1
# if defined(__FreeBSD__) && __FreeBSD_version >= 500000 # if defined(__FreeBSD__)
# include <sys/joystick.h> # include <sys/joystick.h>
# else # else
/* /*
@ -656,9 +656,9 @@ static void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
if (usage > 0 && usage < _JS_MAX_BUTTONS + 1) if (usage > 0 && usage < _JS_MAX_BUTTONS + 1)
{ {
if (d) if (d)
joy->os->cache_buttons |= (1 << usage - 1); joy->os->cache_buttons |= (1 << ( usage - 1 ));
else else
joy->os->cache_buttons &= ~(1 << usage - 1); joy->os->cache_buttons &= ~(1 << ( usage - 1 ));
} }
} }
} }
@ -1060,8 +1060,10 @@ static void fghJoystickOpen( SFG_Joystick* joy )
# ifdef JS_NEW # ifdef JS_NEW
unsigned char u; unsigned char u;
# else # else
# if defined( __linux__ )
int counter; int counter;
# endif # endif
# endif
#endif #endif
/* /*