merge from head.

10 files changed, 36 insertions, 32 deletions

diff --git a/lib/libusb/libusb.h b/lib/libusb/libusb.h
index 7981862..03f03e4 100644
--- a/lib/libusb/libusb.h
+++ b/lib/libusb/libusb.h
@@ -30,8 +30,6 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
-
-
 #ifdef __cplusplus
 extern	"C" {
 #endif
diff --git a/lib/libusb/libusb10.c b/lib/libusb/libusb10.c
index 7e9e885..9f14eaa 100644
--- a/lib/libusb/libusb10.c
+++ b/lib/libusb/libusb10.c
@@ -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>
 
 #include "libusb20.h"
 #include "libusb20_desc.h"
diff --git a/lib/libusb/libusb10_desc.c b/lib/libusb/libusb10_desc.c
index 18a8a8b..2e9bc20 100644
--- a/lib/libusb/libusb10_desc.c
+++ b/lib/libusb/libusb10_desc.c
@@ -24,10 +24,11 @@
  * SUCH DAMAGE.
  */
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <sys/queue.h>
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "libusb20.h"
 #include "libusb20_desc.h"
 #include "libusb20_int.h"
diff --git a/lib/libusb/libusb10_io.c b/lib/libusb/libusb10_io.c
index 119132e..47a1b68 100644
--- a/lib/libusb/libusb10_io.c
+++ b/lib/libusb/libusb10_io.c
@@ -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>
 
 #include "libusb20.h"
 #include "libusb20_desc.h"
diff --git a/lib/libusb/libusb20.c b/lib/libusb/libusb20.c
index e181b49..3efa9c7 100644
--- a/lib/libusb/libusb20.c
+++ b/lib/libusb/libusb20.c
@@ -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"
diff --git a/lib/libusb/libusb20.h b/lib/libusb/libusb20.h
index 6b253aa..d16c6a6 100644
--- a/lib/libusb/libusb20.h
+++ b/lib/libusb/libusb20.h
@@ -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" {
diff --git a/lib/libusb/libusb20_compat01.c b/lib/libusb/libusb20_compat01.c
index 2fbbae7..b4f476b 100644
--- a/lib/libusb/libusb20_compat01.c
+++ b/lib/libusb/libusb20_compat01.c
@@ -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"
diff --git a/lib/libusb/libusb20_desc.c b/lib/libusb/libusb20_desc.c
index 7d462a6..5ee61b2 100644
--- a/lib/libusb/libusb20_desc.c
+++ b/lib/libusb/libusb20_desc.c
@@ -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"
diff --git a/lib/libusb/libusb20_ugen20.c b/lib/libusb/libusb20_ugen20.c
index 76e96d5..73daa40 100644
--- a/lib/libusb/libusb20_ugen20.c
+++ b/lib/libusb/libusb20_ugen20.c
@@ -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"
diff --git a/lib/libusb/usb.h b/lib/libusb/usb.h
index 5d9c603..a29f48d 100644
--- a/lib/libusb/usb.h
+++ b/lib/libusb/usb.h
@@ -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 */