svn commit: r215477 - stable/8/lib/libusb
Andrew Thompson
thompsa at FreeBSD.org
Fri Nov 19 01:20:54 UTC 2010
Author: thompsa
Date: Fri Nov 19 01:20:53 2010
New Revision: 215477
URL: http://svn.freebsd.org/changeset/base/215477
Log:
MFC r203815
Resort includes to match style(9) a bit more. No functional change
is expected after this commit.
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
stable/8/lib/libusb/libusb20.c
stable/8/lib/libusb/libusb20.h
stable/8/lib/libusb/libusb20_compat01.c
stable/8/lib/libusb/libusb20_desc.c
stable/8/lib/libusb/libusb20_ugen20.c
stable/8/lib/libusb/usb.h (contents, props changed)
Directory Properties:
stable/8/lib/libusb/ (props changed)
Modified: stable/8/lib/libusb/libusb.h
==============================================================================
--- stable/8/lib/libusb/libusb.h Fri Nov 19 01:18:52 2010 (r215476)
+++ stable/8/lib/libusb/libusb.h Fri Nov 19 01:20:53 2010 (r215477)
@@ -30,8 +30,6 @@
#include <sys/time.h>
#include <sys/types.h>
-
-
#ifdef __cplusplus
extern "C" {
#endif
Modified: stable/8/lib/libusb/libusb10.c
==============================================================================
--- stable/8/lib/libusb/libusb10.c Fri Nov 19 01:18:52 2010 (r215476)
+++ stable/8/lib/libusb/libusb10.c Fri Nov 19 01:20:53 2010 (r215477)
@@ -25,16 +25,17 @@
* SUCH DAMAGE.
*/
+#include <sys/fcntl.h>
+#include <sys/ioctl.h>
+#include <sys/queue.h>
+
#include <assert.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
+#include <errno.h>
#include <poll.h>
#include <pthread.h>
-#include <errno.h>
-#include <sys/ioctl.h>
-#include <sys/fcntl.h>
-#include <sys/queue.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
#define libusb_device_handle libusb20_device
Modified: stable/8/lib/libusb/libusb10_desc.c
==============================================================================
--- stable/8/lib/libusb/libusb10_desc.c Fri Nov 19 01:18:52 2010 (r215476)
+++ stable/8/lib/libusb/libusb10_desc.c Fri Nov 19 01:20:53 2010 (r215477)
@@ -24,12 +24,13 @@
* SUCH DAMAGE.
*/
-#include <stdlib.h>
-#include <stdio.h>
#include <sys/queue.h>
#define libusb_device_handle libusb20_device
+#include <stdio.h>
+#include <stdlib.h>
+
#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 Fri Nov 19 01:18:52 2010 (r215476)
+++ stable/8/lib/libusb/libusb10_io.c Fri Nov 19 01:20:53 2010 (r215477)
@@ -24,14 +24,15 @@
* SUCH DAMAGE.
*/
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
+#include <sys/queue.h>
+
+#include <errno.h>
#include <poll.h>
#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
#include <time.h>
-#include <errno.h>
-#include <sys/queue.h>
+#include <unistd.h>
#define libusb_device_handle libusb20_device
Modified: stable/8/lib/libusb/libusb20.c
==============================================================================
--- stable/8/lib/libusb/libusb20.c Fri Nov 19 01:18:52 2010 (r215476)
+++ stable/8/lib/libusb/libusb20.c Fri Nov 19 01:20:53 2010 (r215477)
@@ -24,12 +24,13 @@
* SUCH DAMAGE.
*/
+#include <sys/queue.h>
+
+#include <ctype.h>
+#include <poll.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <poll.h>
-#include <ctype.h>
-#include <sys/queue.h>
#include "libusb20.h"
#include "libusb20_desc.h"
Modified: stable/8/lib/libusb/libusb20.h
==============================================================================
--- stable/8/lib/libusb/libusb20.h Fri Nov 19 01:18:52 2010 (r215476)
+++ stable/8/lib/libusb/libusb20.h Fri Nov 19 01:20:53 2010 (r215477)
@@ -29,13 +29,13 @@
#ifndef _LIBUSB20_H_
#define _LIBUSB20_H_
-#include <stdint.h>
-#include <time.h>
-#include <string.h>
-
+#include <sys/endian.h>
#include <sys/time.h>
#include <sys/types.h>
-#include <sys/endian.h>
+
+#include <stdint.h>
+#include <string.h>
+#include <time.h>
#ifdef __cplusplus
extern "C" {
Modified: stable/8/lib/libusb/libusb20_compat01.c
==============================================================================
--- stable/8/lib/libusb/libusb20_compat01.c Fri Nov 19 01:18:52 2010 (r215476)
+++ stable/8/lib/libusb/libusb20_compat01.c Fri Nov 19 01:20:53 2010 (r215477)
@@ -30,9 +30,9 @@
#include <sys/queue.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
#include "libusb20.h"
#include "libusb20_desc.h"
Modified: stable/8/lib/libusb/libusb20_desc.c
==============================================================================
--- stable/8/lib/libusb/libusb20_desc.c Fri Nov 19 01:18:52 2010 (r215476)
+++ stable/8/lib/libusb/libusb20_desc.c Fri Nov 19 01:20:53 2010 (r215477)
@@ -24,10 +24,11 @@
* SUCH DAMAGE.
*/
+#include <sys/queue.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <sys/queue.h>
#include "libusb20.h"
#include "libusb20_desc.h"
Modified: stable/8/lib/libusb/libusb20_ugen20.c
==============================================================================
--- stable/8/lib/libusb/libusb20_ugen20.c Fri Nov 19 01:18:52 2010 (r215476)
+++ stable/8/lib/libusb/libusb20_ugen20.c Fri Nov 19 01:20:53 2010 (r215477)
@@ -27,12 +27,12 @@
#include <sys/queue.h>
#include <sys/types.h>
+#include <errno.h>
+#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
-#include <unistd.h>
#include <string.h>
-#include <fcntl.h>
-#include <errno.h>
+#include <unistd.h>
#include "libusb20.h"
#include "libusb20_desc.h"
Modified: stable/8/lib/libusb/usb.h
==============================================================================
--- stable/8/lib/libusb/usb.h Fri Nov 19 01:18:52 2010 (r215476)
+++ stable/8/lib/libusb/usb.h Fri Nov 19 01:20:53 2010 (r215477)
@@ -27,9 +27,10 @@
#ifndef _LIBUSB20_COMPAT_01_H_
#define _LIBUSB20_COMPAT_01_H_
-#include <stdint.h>
-#include <sys/types.h>
#include <sys/param.h>
+#include <sys/endian.h>
+
+#include <stdint.h>
/* USB interface class codes */
More information about the svn-src-stable
mailing list