svn commit: r208020 - head/lib/libusb

[Andrew Thompson]

Author: thompsa
Date: Thu May 13 00:25:30 2010
New Revision: 208020
URL: http://svn.freebsd.org/changeset/base/208020

Log:
  Fix header file compliancy with libusb 1.0 from sourceforge.
  
  Reported by:	Xiaofan Chen
  Submitted by:	Hans Petter Selasky

Modified:
  head/lib/libusb/libusb.h
  head/lib/libusb/libusb10.c
  head/lib/libusb/libusb10_desc.c
  head/lib/libusb/libusb10_io.c

Modified: head/lib/libusb/libusb.h
==============================================================================
--- head/lib/libusb/libusb.h	Thu May 13 00:19:03 2010	(r208019)
+++ head/lib/libusb/libusb.h	Thu May 13 00:25:30 2010	(r208020)
@@ -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);

Modified: head/lib/libusb/libusb10.c
==============================================================================
--- head/lib/libusb/libusb10.c	Thu May 13 00:19:03 2010	(r208019)
+++ head/lib/libusb/libusb10.c	Thu May 13 00:25:30 2010	(r208020)
@@ -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"

Modified: head/lib/libusb/libusb10_desc.c
==============================================================================
--- head/lib/libusb/libusb10_desc.c	Thu May 13 00:19:03 2010	(r208019)
+++ head/lib/libusb/libusb10_desc.c	Thu May 13 00:25:30 2010	(r208020)
@@ -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"

Modified: head/lib/libusb/libusb10_io.c
==============================================================================
--- head/lib/libusb/libusb10_io.c	Thu May 13 00:19:03 2010	(r208019)
+++ head/lib/libusb/libusb10_io.c	Thu May 13 00:25:30 2010	(r208020)
@@ -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"