From 40310299b8ffb63ea75c19d7352572e3f5bea061 Mon Sep 17 00:00:00 2001
From: thompsa <thompsa@FreeBSD.org>
Date: Mon, 17 May 2010 23:55:23 +0000
Subject: MFC r208020

 Fix header file compliancy with libusb 1.0 from sourceforge.
---
 lib/libusb/libusb.h        | 4 ++--
 lib/libusb/libusb10.c      | 2 ++
 lib/libusb/libusb10_desc.c | 2 ++
 lib/libusb/libusb10_io.c   | 2 ++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/libusb/libusb.h b/lib/libusb/libusb.h
index bdf2812..fb18c6e 100644
--- a/lib/libusb/libusb.h
+++ b/lib/libusb/libusb.h
@@ -185,7 +185,7 @@ enum libusb_debug_level {
 struct libusb_context;
 struct libusb_device;
 struct libusb_transfer;
-struct libusb20_device;
+struct libusb_device_handle;
 
 struct libusb_pollfd {
 	int	fd;
@@ -194,7 +194,7 @@ struct libusb_pollfd {
 
 typedef struct libusb_context libusb_context;
 typedef struct libusb_device libusb_device;
-typedef struct libusb20_device libusb_device_handle;
+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);
diff --git a/lib/libusb/libusb10.c b/lib/libusb/libusb10.c
index 25520d2..598e78c 100644
--- a/lib/libusb/libusb10.c
+++ b/lib/libusb/libusb10.c
@@ -37,6 +37,8 @@
 #include <sys/queue.h>
 #include <sys/endian.h>
 
+#define	libusb_device_handle libusb20_device
+
 #include "libusb20.h"
 #include "libusb20_desc.h"
 #include "libusb20_int.h"
diff --git a/lib/libusb/libusb10_desc.c b/lib/libusb/libusb10_desc.c
index 0215bce..b5b06bc 100644
--- a/lib/libusb/libusb10_desc.c
+++ b/lib/libusb/libusb10_desc.c
@@ -29,6 +29,8 @@
 #include <pthread.h>
 #include <sys/queue.h>
 
+#define	libusb_device_handle libusb20_device
+
 #include "libusb20.h"
 #include "libusb20_desc.h"
 #include "libusb20_int.h"
diff --git a/lib/libusb/libusb10_io.c b/lib/libusb/libusb10_io.c
index 3d6daef..ce79723 100644
--- a/lib/libusb/libusb10_io.c
+++ b/lib/libusb/libusb10_io.c
@@ -34,6 +34,8 @@
 #include <sys/queue.h>
 #include <sys/endian.h>
 
+#define	libusb_device_handle libusb20_device
+
 #include "libusb20.h"
 #include "libusb20_desc.h"
 #include "libusb20_int.h"
-- 
cgit v1.1