diff options
Diffstat (limited to 'comms/hidapi/files/patch-libusb-hid.c')
| -rw-r--r-- | comms/hidapi/files/patch-libusb-hid.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/comms/hidapi/files/patch-libusb-hid.c b/comms/hidapi/files/patch-libusb-hid.c index 96d0cd651584..446a1f34a649 100644 --- a/comms/hidapi/files/patch-libusb-hid.c +++ b/comms/hidapi/files/patch-libusb-hid.c @@ -1,4 +1,4 @@ ---- libusb/hid.c.orig +--- libusb/hid.c.orig 2013-10-06 22:43:37 UTC +++ libusb/hid.c @@ -25,6 +25,8 @@ @@ -9,7 +9,7 @@ /* C */ #include <stdio.h> #include <string.h> -@@ -250,7 +252,7 @@ +@@ -250,7 +252,7 @@ static int get_usage(uint8_t *report_des } #endif /* INVASIVE_GET_USAGE */ @@ -18,7 +18,20 @@ /* The FreeBSD version of libusb doesn't have this funciton. In mainline libusb, it's inlined in libusb.h. This function will bear a striking resemblence to that one, because there's about one way to code it. -@@ -757,7 +757,11 @@ +@@ -333,11 +335,7 @@ static wchar_t *get_usb_string(libusb_de + size_t inbytes; + size_t outbytes; + size_t res; +-#ifdef __FreeBSD__ +- const char *inptr; +-#else +- char *inptr; +-#endif ++ ICONV_CONST char *inptr; + char *outptr; + + /* Determine which language to use. */ +@@ -757,7 +755,11 @@ static void *read_thread(void *param) libusb_cancel_transfer(dev->transfer); while (!dev->cancelled) |