summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Batard <pbatard@gmail.com>2010-02-24 22:06:18 +0000
committerPete Batard <pbatard@gmail.com>2010-02-24 22:06:18 +0000
commit6c7a1e0ca48e20bc56876ad469d2a84499e58cd1 (patch)
treed46e52d9cff5dbbe559d2f7866f15f4ff35948b7
parentdbd439fa2cbda41abbc2edc8d03c8a03a00710b8 (diff)
downloadlibusb-6c7a1e0ca48e20bc56876ad469d2a84499e58cd1.tar.gz
includes simplification and cleanup (os)r173
-rw-r--r--libusb/os/threads_windows.c3
-rw-r--r--libusb/os/windows_compat.c4
-rw-r--r--libusb/os/windows_usb.c2
3 files changed, 3 insertions, 6 deletions
diff --git a/libusb/os/threads_windows.c b/libusb/os/threads_windows.c
index f0704b2..aa3311a 100644
--- a/libusb/os/threads_windows.c
+++ b/libusb/os/threads_windows.c
@@ -23,8 +23,7 @@
#include <errno.h>
#include <stdarg.h>
-#include "libusb.h"
-#include "libusbi.h"
+#include <libusbi.h>
int usbi_mutex_init(usbi_mutex_t *mutex,
diff --git a/libusb/os/windows_compat.c b/libusb/os/windows_compat.c
index d456422..664bf5d 100644
--- a/libusb/os/windows_compat.c
+++ b/libusb/os/windows_compat.c
@@ -60,15 +60,13 @@
* use the OVERLAPPED directly (which is what we do in the USB async I/O
* functions), the marker is not used at all.
*/
-#include <windows.h>
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
-#include <stdint.h>
#include <io.h>
-#include "libusbi.h"
+#include <libusbi.h>
// Uncomment to debug the polling layer
//#define DEBUG_WINDOWS_COMPAT
diff --git a/libusb/os/windows_usb.c b/libusb/os/windows_usb.c
index 291212f..3f404a8 100644
--- a/libusb/os/windows_usb.c
+++ b/libusb/os/windows_usb.c
@@ -46,7 +46,7 @@
#include <inttypes.h>
#include <objbase.h> // for string to GUID conv. requires libole32.a
-#include "libusbi.h"
+#include <libusbi.h>
#include "windows_compat.h"
#include "windows_usb.h"