renamed windows_compat to poll_windows

6 files changed, 9 insertions, 9 deletions

diff --git a/libusb/Makefile.am b/libusb/Makefile.am
index 1ec8829..c252b3d 100644
--- a/libusb/Makefile.am
+++ b/libusb/Makefile.am
@@ -8,7 +8,7 @@ endif
 
 LINUX_USBFS_SRC = $(THREADS_SRC) os/poll_posix.h os/linux_usbfs.h os/linux_usbfs.c
 DARWIN_USB_SRC = $(THREADS_SRC) os/poll_posix.h os/darwin_usb.h os/darwin_usb.c
-WINDOWS_USB_SRC = $(THREADS_SRC) os/windows_compat.h os/windows_compat.c os/windows_usb.h os/windows_usb.c
+WINDOWS_USB_SRC = $(THREADS_SRC) os/poll_windows.h os/poll_windows.c os/windows_usb.h os/windows_usb.c
 
 EXTRA_DIST = $(LINUX_USBFS_SRC) $(DARWIN_USB_SRC) $(WINDOWS_USB_SRC)
 
diff --git a/libusb/libusbi.h b/libusb/libusbi.h
index 33b642c..d7fd4a4 100644
--- a/libusb/libusbi.h
+++ b/libusb/libusbi.h
@@ -178,10 +178,10 @@ void inline usbi_dbg(const char *format, ...)
 #include <os/threads_posix.h>
 #elif defined(OS_WINDOWS) && (defined(__CYGWIN__) || defined(USE_PTHREAD))
 #include <os/threads_posix.h>
-#include <os/windows_compat.h>
+#include <os/poll_windows.h>
 #elif defined(OS_WINDOWS)
 #include <os/threads_windows.h>
-#include <os/windows_compat.h>
+#include <os/poll_windows.h>
 #endif
 
 extern struct libusb_context *usbi_default_context;
diff --git a/libusb/os/windows_compat.c b/libusb/os/poll_windows.c
index 5ce7a88..3395756 100644
--- a/libusb/os/windows_compat.c
+++ b/libusb/os/poll_windows.c
@@ -1,5 +1,5 @@
 /*
- * Windows compat: POSIX compatibility wrapper
+ * poll_windows: poll compatibility wrapper for Windows
  * Copyright (C) 2009-2010 Pete Batard <pbatard@gmail.com>
  * With contributions from Michael Plante, Orin Eman et al.
  * Parts of poll implementation from libusb-win32, by Stephan Meyer et al.
@@ -21,7 +21,7 @@
  */
 
 /*
- * Posix poll() and pipe() Windows compatibility layer for libusb 1.0
+ * poll() and pipe() Windows compatibility layer for libusb 1.0
  *
  * The way this layer works is by using OVERLAPPED with async I/O transfers, as
  * OVERLAPPED have an associated event which is flagged for I/O completion.
@@ -69,14 +69,14 @@
 #include <libusbi.h>
 
 // Uncomment to debug the polling layer
-#define DEBUG_WINDOWS_COMPAT
+//#define DEBUG_POLL_WINDOWS
 
 // Uncomment to have poll return with EINTR as soon as a new transfer (fd) is added
 // This should result in a LIBUSB_ERROR_INTERRUPTED being returned by libusb calls,
 // which should give the app an opportunity to resubmit a new fd set.
 //#define DYNAMIC_FDS
 
-#if defined(DEBUG_WINDOWS_COMPAT)
+#if defined(DEBUG_POLL_WINDOWS)
 #define poll_dbg usbi_dbg
 #else
 #define poll_dbg
diff --git a/libusb/os/windows_compat.h b/libusb/os/poll_windows.h
index 996ff48..996ff48 100644
--- a/libusb/os/windows_compat.h
+++ b/libusb/os/poll_windows.h
diff --git a/libusb/os/sources b/libusb/os/sources
index 669e32a..dc474ca 100644
--- a/libusb/os/sources
+++ b/libusb/os/sources
@@ -23,7 +23,7 @@ SOURCES=..\core.c \
 	..\io.c \
 	..\sync.c \
 	threads_windows.c \
-	windows_compat.c \
+	poll_windows.c \
 	windows_usb.c \
 	libusb-1.0.rc
 
diff --git a/libusb/os/windows_usb.c b/libusb/os/windows_usb.c
index e439b8b..bced4ee 100644
--- a/libusb/os/windows_usb.c
+++ b/libusb/os/windows_usb.c
@@ -47,7 +47,7 @@
 #include <objbase.h>  // for string to GUID conv. requires libole32.a
 
 #include <libusbi.h>
-#include "windows_compat.h"
+#include "poll_windows.h"
 #include "windows_usb.h"
 
 #if defined(_PREFAST_)