From f2297884fa8831e8e58b914c700aafe125ea89e5 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Wed, 24 Feb 2010 23:04:03 +0000 Subject: reverts some of the changes from dbd439/6c7a1e (r173) --- libusb/core.c | 2 +- libusb/descriptor.c | 2 +- libusb/io.c | 2 +- libusb/libusb.h | 4 ++-- libusb/os/threads_windows.c | 2 +- libusb/sync.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libusb/core.c b/libusb/core.c index 2daa0c3..6da729f 100644 --- a/libusb/core.c +++ b/libusb/core.c @@ -28,7 +28,7 @@ #include "os/unistd_posix.h" #endif -#include +#include "libusbi.h" #if defined(OS_LINUX) const struct usbi_os_backend * const usbi_backend = &linux_usbfs_backend; diff --git a/libusb/descriptor.c b/libusb/descriptor.c index b66d2b3..da4dbbe 100644 --- a/libusb/descriptor.c +++ b/libusb/descriptor.c @@ -22,7 +22,7 @@ #include #include -#include +#include "libusbi.h" #define DESC_HEADER_LENGTH 2 #define DEVICE_DESC_LENGTH 18 diff --git a/libusb/io.c b/libusb/io.c index 894d514..48122b5 100644 --- a/libusb/io.c +++ b/libusb/io.c @@ -32,7 +32,7 @@ #include #endif -#include +#include "libusbi.h" /** * \page io Synchronous and asynchronous device I/O diff --git a/libusb/libusb.h b/libusb/libusb.h index 62ee63c..8986013 100644 --- a/libusb/libusb.h +++ b/libusb/libusb.h @@ -22,14 +22,14 @@ #define __LIBUSB_H__ #include -#include -#include #ifdef _MSC_VER #define inline __inline #else #include #endif #include +#include +#include /* 'interface' might be defined as a macro on Windows, so we need to * undefine it so as not to break the current libusb API, because diff --git a/libusb/os/threads_windows.c b/libusb/os/threads_windows.c index aa3311a..11b55f9 100644 --- a/libusb/os/threads_windows.c +++ b/libusb/os/threads_windows.c @@ -23,7 +23,7 @@ #include #include -#include +#include "libusbi.h" int usbi_mutex_init(usbi_mutex_t *mutex, diff --git a/libusb/sync.c b/libusb/sync.c index e43b18e..51db50d 100644 --- a/libusb/sync.c +++ b/libusb/sync.c @@ -22,7 +22,7 @@ #include #include -#include +#include "libusbi.h" /** * @defgroup syncio Synchronous device I/O -- cgit v1.2.1