From 5353baf94bd1064a2c907880dd3886a84d081d2f Mon Sep 17 00:00:00 2001
From: thompsa <thompsa@FreeBSD.org>
Date: Thu, 13 May 2010 00:25:30 +0000
Subject: Fix header file compliancy with libusb 1.0 from sourceforge.

Reported by:	Xiaofan Chen
Submitted by:	Hans Petter Selasky
---
 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(-)

(limited to 'lib/libusb')

diff --git a/lib/libusb/libusb.h b/lib/libusb/libusb.h
index 03f03e4..b8e2322 100644
--- a/lib/libusb/libusb.h
+++ b/lib/libusb/libusb.h
@@ -178,7 +178,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;
@@ -187,7 +187,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 9f14eaa..a3f0087 100644
--- a/lib/libusb/libusb10.c
+++ b/lib/libusb/libusb10.c
@@ -37,6 +37,8 @@
 #include <stdlib.h>
 #include <unistd.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 2e9bc20..5823723 100644
--- a/lib/libusb/libusb10_desc.c
+++ b/lib/libusb/libusb10_desc.c
@@ -29,6 +29,8 @@
 #include <stdio.h>
 #include <stdlib.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 47a1b68..1f0d0ba 100644
--- a/lib/libusb/libusb10_io.c
+++ b/lib/libusb/libusb10_io.c
@@ -34,6 +34,8 @@
 #include <time.h>
 #include <unistd.h>
 
+#define	libusb_device_handle libusb20_device
+
 #include "libusb20.h"
 #include "libusb20_desc.h"
 #include "libusb20_int.h"
-- 
cgit v1.1