d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve issue with libusb C++ header file inclusion.

Browse Source 
Approved by:	re (marius)
PR:		210509
MFC after:	1 week
This commit is contained in:
Hans Petter Selasky 2016-06-24 10:55:14 +00:00
parent 591dda3ad0
commit 56c926d077
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=302171
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libusb/libusb.h
View File

@ -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;

6
lib/libusb/libusb10.h
View File

@ -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;