diff options
| author | hselasky <hselasky@FreeBSD.org> | 2016-06-24 10:55:14 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2016-06-24 10:55:14 +0000 |
| commit | d8136cee93d08050c6080ff46e346d23485e4f17 (patch) | |
| tree | 8294e29faec4a6d49c108b7e2f71e145079fb413 /lib | |
| parent | a6d3c25f9a41e1fc574f3de67cffb96e579dd6fb (diff) | |
| download | FreeBSD-src-d8136cee93d08050c6080ff46e346d23485e4f17.zip FreeBSD-src-d8136cee93d08050c6080ff46e346d23485e4f17.tar.gz | |
Resolve issue with libusb C++ header file inclusion.
Approved by: re (marius)
PR: 210509
MFC after: 1 week
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libusb/libusb.h | 4 | ||||
| -rw-r--r-- | lib/libusb/libusb10.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/libusb/libusb.h b/lib/libusb/libusb.h index 9b48894..44bdb4b 100644 --- a/lib/libusb/libusb.h +++ b/lib/libusb/libusb.h @@ -254,7 +254,7 @@ struct libusb_context; struct libusb_device; struct libusb_transfer; struct libusb_device_handle; -struct libusb_hotplug_callback_handle; +struct libusb_hotplug_callback_handle_struct; struct libusb_pollfd { int fd; @@ -276,7 +276,7 @@ typedef struct libusb_device_handle libusb_device_handle; typedef struct libusb_pollfd libusb_pollfd; typedef void (*libusb_pollfd_added_cb) (int fd, short events, void *user_data); typedef void (*libusb_pollfd_removed_cb) (int fd, void *user_data); -typedef struct libusb_hotplug_callback_handle *libusb_hotplug_callback_handle; +typedef struct libusb_hotplug_callback_handle_struct *libusb_hotplug_callback_handle; typedef struct libusb_device_descriptor { uint8_t bLength; diff --git a/lib/libusb/libusb10.h b/lib/libusb/libusb10.h index ad3f934..86bf5e3 100644 --- a/lib/libusb/libusb10.h +++ b/lib/libusb/libusb10.h @@ -75,8 +75,8 @@ struct libusb_super_transfer { #define LIBUSB_SUPER_XFER_ST_PEND 1 }; -struct libusb_hotplug_callback_handle { - TAILQ_ENTRY(libusb_hotplug_callback_handle) entry; +struct libusb_hotplug_callback_handle_struct { + TAILQ_ENTRY(libusb_hotplug_callback_handle_struct) entry; int events; int vendor; int product; @@ -101,7 +101,7 @@ struct libusb_context { TAILQ_HEAD(, libusb_super_pollfd) pollfds; TAILQ_HEAD(, libusb_super_transfer) tr_done; - TAILQ_HEAD(, libusb_hotplug_callback_handle) hotplug_cbh; + TAILQ_HEAD(, libusb_hotplug_callback_handle_struct) hotplug_cbh; TAILQ_HEAD(, libusb_device) hotplug_devs; struct libusb_super_pollfd ctx_poll; |
