pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged r5547:5548 from branches/SDL-1.2: FreeBSD joystick uninit'd var fix.

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%404462
This commit is contained in:
Ryan C. Gordon 2010-02-05 19:23:59 +00:00
parent b4ec792804
commit 2570f36a05
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/joystick/bsd/SDL_sysjoystick.c
View file

@ -307,11 +307,11 @@ SDL_SYS_JoystickOpen(SDL_Joystick * joy)
strerror(errno)); strerror(errno));
goto usberr; goto usberr;
} }
rep = &hw->inreport;
#if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063) #if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063)
rep->rid = hid_get_report_id(fd); rep->rid = hid_get_report_id(fd);
if (rep->rid < 0) { if (rep->rid < 0) {
#else #else
rep = &hw->inreport;
if (ioctl(fd, USB_GET_REPORT_ID, &rep->rid) < 0) { if (ioctl(fd, USB_GET_REPORT_ID, &rep->rid) < 0) {
#endif #endif
rep->rid = -1; /* XXX */ rep->rid = -1; /* XXX */