diff options
| author | Sam Lantinga <slouken@libsdl.org> | 2012-02-15 21:06:08 -0500 |
|---|---|---|
| committer | Sam Lantinga <slouken@libsdl.org> | 2012-02-15 21:06:08 -0500 |
| commit | 31beff2f3a5cd3932f0d3562036ef7608276d166 (patch) | |
| tree | 839ad5478e8db38460ffef0d697a4a935677e16d | |
| parent | 7d568312dec1d223d4bfb421e83ff63053ee4037 (diff) | |
| download | sdl-31beff2f3a5cd3932f0d3562036ef7608276d166.tar.gz | |
FreeBSD compile fix
Robert Millan
src/joystick/bsd/SDL_sysjoystick.c makes the invalid assumption that
__FreeBSD_kernel__ implies presence of "ucr_data" struct member. This
breaks recent versions of FreeBSD 10-CURRENT, FreeBSD 9-STABLE and
Debian GNU/kFreeBSD "wheezy/sid".
| -rw-r--r-- | src/joystick/bsd/SDL_sysjoystick.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/joystick/bsd/SDL_sysjoystick.c b/src/joystick/bsd/SDL_sysjoystick.c index 500fc6295..987df075f 100644 --- a/src/joystick/bsd/SDL_sysjoystick.c +++ b/src/joystick/bsd/SDL_sysjoystick.c @@ -148,7 +148,7 @@ static char *joydevnames[MAX_JOYS]; static int report_alloc(struct report *, struct report_desc *, int); static void report_free(struct report *); -#if defined(USBHID_UCR_DATA) || defined(__FreeBSD_kernel__) +#if defined(USBHID_UCR_DATA) #define REP_BUF_DATA(rep) ((rep)->buf->ucr_data) #elif (defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063)) #define REP_BUF_DATA(rep) ((rep)->buf->ugd_data) |