Author: hselasky
Date: Fri Jun 24 10:55:14 2016
New Revision: 302171
URL: https://svnweb.freebsd.org/changeset/base/302171
Log:
Resolve issue with libusb C++ header file inclusion.
Approved by: re (marius)
PR: 210509
MFC after: 1 week
Modified:
head/lib/libusb/libusb.h
head/lib/libusb/libusb10.h
Modified: head/lib/libusb/libusb.h
==============================================================================
--- head/lib/libusb/libusb.h Fri Jun 24 02:30:14 2016 (r302170)
+++ head/lib/libusb/libusb.h Fri Jun 24 10:55:14 2016 (r302171)
@@ -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 libu
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;
Modified: head/lib/libusb/libusb10.h
==============================================================================
--- head/lib/libusb/libusb10.h Fri Jun 24 02:30:14 2016 (r302170)
+++ head/lib/libusb/libusb10.h Fri Jun 24 10:55:14 2016 (r302171)
@@ -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;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
