svn commit: r208233 - stable/8/lib/libusb

[Andrew Thompson]

Author: thompsa
Date: Mon May 17 23:55:23 2010
New Revision: 208233
URL: http://svn.freebsd.org/changeset/base/208233

Log:
  MFC r208020
  
   Fix header file compliancy with libusb 1.0 from sourceforge.

Modified:
  stable/8/lib/libusb/libusb.h
  stable/8/lib/libusb/libusb10.c
  stable/8/lib/libusb/libusb10_desc.c
  stable/8/lib/libusb/libusb10_io.c
Directory Properties:
  stable/8/lib/libusb/   (props changed)
  stable/8/lib/libusb/usb.h   (props changed)

Modified: stable/8/lib/libusb/libusb.h
==============================================================================
--- stable/8/lib/libusb/libusb.h	Mon May 17 23:52:33 2010	(r208232)
+++ stable/8/lib/libusb/libusb.h	Mon May 17 23:55:23 2010	(r208233)
@@ -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);

Modified: stable/8/lib/libusb/libusb10.c
==============================================================================
--- stable/8/lib/libusb/libusb10.c	Mon May 17 23:52:33 2010	(r208232)
+++ stable/8/lib/libusb/libusb10.c	Mon May 17 23:55:23 2010	(r208233)
@@ -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"

Modified: stable/8/lib/libusb/libusb10_desc.c
==============================================================================
--- stable/8/lib/libusb/libusb10_desc.c	Mon May 17 23:52:33 2010	(r208232)
+++ stable/8/lib/libusb/libusb10_desc.c	Mon May 17 23:55:23 2010	(r208233)
@@ -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"

Modified: stable/8/lib/libusb/libusb10_io.c
==============================================================================
--- stable/8/lib/libusb/libusb10_io.c	Mon May 17 23:52:33 2010	(r208232)
+++ stable/8/lib/libusb/libusb10_io.c	Mon May 17 23:55:23 2010	(r208233)
@@ -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"