We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Fixed patch

joystick.diff (text/plain), 1.43 KB, created by q66 on 2013-03-04 17:01:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: q66

Created: 2013-03-04 17:01:40 UTC

Size: 1.43 KB

patch

obsolete

>--- src/joystick/bsd/SDL_sysjoystick.c.orig	2013-03-04 22:42:52.838832126 +0100
>+++ src/joystick/bsd/SDL_sysjoystick.c	2013-03-04 22:49:12.807833161 +0100
>@@ -83,7 +83,9 @@
> 
> struct report
> {
>-#if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063)
>+#if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 900000)
>+    void *buf; /* Buffer */
>+#elif defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063)
>     struct usb_gen_descriptor *buf; /* Buffer */
> #else
>     struct usb_ctl_report *buf; /* Buffer */
>@@ -149,8 +151,10 @@
> static int report_alloc(struct report *, struct report_desc *, int);
> static void report_free(struct report *);
> 
>-#if defined(USBHID_UCR_DATA)
>+#if defined(USBHID_UCR_DATA) || (defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version <= 800063)
> #define REP_BUF_DATA(rep) ((rep)->buf->ucr_data)
>+#elif (defined(__FREEBSD__) && (__FreeBSD_kernel_version > 900000))
>+#define REP_BUF_DATA(rep) ((rep)->buf)
> #elif (defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063))
> #define REP_BUF_DATA(rep) ((rep)->buf->ugd_data)
> #else
>@@ -636,8 +640,12 @@
>     r->size = len;
> 
>     if (r->size > 0) {
>+#if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 900000)
>+        r->buf = SDL_malloc(r->size);
>+#else
>         r->buf = SDL_malloc(sizeof(*r->buf) - sizeof(REP_BUF_DATA(r)) +
>                             r->size);
>+#endif
>         if (r->buf == NULL) {
>             SDL_OutOfMemory();
>             return (-1);

Actions: View | Diff

Attachments on bug 1553: 909 | 1057

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.