PERFORCE change 175194 for review

Hans Petter Selasky hselasky at FreeBSD.org
Sun Feb 28 10:20:25 UTC 2010


http://p4web.freebsd.org/chv.cgi?CH=175194

Change 175194 by hselasky at hselasky_laptop001 on 2010/02/28 10:20:08

	
	LibUSB v1.0:
		- fix header file compliancy with libusb 1.0 from sourceforge.
		- reported by: Xiaofan Chen

Affected files ...

.. //depot/projects/usb/src/lib/libusb/libusb.h#14 edit
.. //depot/projects/usb/src/lib/libusb/libusb10.c#23 edit
.. //depot/projects/usb/src/lib/libusb/libusb10_desc.c#12 edit
.. //depot/projects/usb/src/lib/libusb/libusb10_io.c#13 edit

Differences ...

==== //depot/projects/usb/src/lib/libusb/libusb.h#14 (text+ko) ====

@@ -185,7 +185,7 @@
 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 @@
 
 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);

==== //depot/projects/usb/src/lib/libusb/libusb10.c#23 (text+ko) ====

@@ -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"

==== //depot/projects/usb/src/lib/libusb/libusb10_desc.c#12 (text+ko) ====

@@ -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"

==== //depot/projects/usb/src/lib/libusb/libusb10_io.c#13 (text+ko) ====

@@ -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"


More information about the p4-projects mailing list