diff mbox

[for-2.7] wxx: Fix compilation of host-libusb.c

Message ID 1469775331-7468-1-git-send-email-sw@weilnetz.de
State New
Headers show

Commit Message

Stefan Weil July 29, 2016, 6:55 a.m. UTC 
libusb.h uses the WINAPI calling convention for all function callbacks.

Cross compilation with Mingw-w64 on Cygwin fails when this calling
convention is missing.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 hw/usb/host-libusb.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

Gerd Hoffmann Aug. 2, 2016, 11:34 a.m. UTC | #1 
On Fr, 2016-07-29 at 08:55 +0200, Stefan Weil wrote:
> libusb.h uses the WINAPI calling convention for all function
> callbacks.
> 
> Cross compilation with Mingw-w64 on Cygwin fails when this calling
> convention is missing.

queued up both mingw fixes.

thanks,
  Gerd
diff mbox

Patch

diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
index da59c29..c632fd8 100644
--- a/hw/usb/host-libusb.c
+++ b/hw/usb/host-libusb.c
@@ -358,7 +358,7 @@  static USBHostRequest *usb_host_req_find(USBHostDevice *s, USBPacket *p)
     return NULL;
 }
 
-static void usb_host_req_complete_ctrl(struct libusb_transfer *xfer)
+static void LIBUSB_CALL usb_host_req_complete_ctrl(struct libusb_transfer *xfer)
 {
     USBHostRequest *r = xfer->user_data;
     USBHostDevice  *s = r->host;
@@ -391,7 +391,7 @@  out:
     }
 }
 
-static void usb_host_req_complete_data(struct libusb_transfer *xfer)
+static void LIBUSB_CALL usb_host_req_complete_data(struct libusb_transfer *xfer)
 {
     USBHostRequest *r = xfer->user_data;
     USBHostDevice  *s = r->host;
@@ -447,7 +447,8 @@  static void usb_host_req_abort(USBHostRequest *r)
 
 /* ------------------------------------------------------------------------ */
 
-static void usb_host_req_complete_iso(struct libusb_transfer *transfer)
+static void LIBUSB_CALL
+usb_host_req_complete_iso(struct libusb_transfer *transfer)
 {
     USBHostIsoXfer *xfer = transfer->user_data;