From owner-p4-projects@FreeBSD.ORG  Sun Feb 28 10:20:25 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C9A851065674; Sun, 28 Feb 2010 10:20:24 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8DE95106566B
	for <perforce@FreeBSD.org>; Sun, 28 Feb 2010 10:20:24 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 613468FC15
	for <perforce@FreeBSD.org>; Sun, 28 Feb 2010 10:20:24 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1SAKO9P023860
	for <perforce@FreeBSD.org>; Sun, 28 Feb 2010 10:20:24 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1SAKOlU023858
	for perforce@freebsd.org; Sun, 28 Feb 2010 10:20:24 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 28 Feb 2010 10:20:24 GMT
Message-Id: <201002281020.o1SAKOlU023858@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 175194 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Feb 2010 10:20:25 -0000

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

Change 175194 by hselasky@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"