summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/lsusb.dsp2
-rw-r--r--examples/xusb.dsp2
-rw-r--r--libusb-dll_2005.vcproj4
-rw-r--r--libusb-dll_2008.vcproj4
-rw-r--r--libusb-static_2005.vcproj4
-rw-r--r--libusb-static_2008.vcproj4
-rw-r--r--libusb/Makefile.am2
-rw-r--r--libusb/libusbi.h4
-rw-r--r--libusb/os/poll_windows.c (renamed from libusb/os/windows_compat.c)8
-rw-r--r--libusb/os/poll_windows.h (renamed from libusb/os/windows_compat.h)0
-rw-r--r--libusb/os/sources2
-rw-r--r--libusb/os/windows_usb.c2
-rw-r--r--libusb_dll.dsp4
-rw-r--r--libusb_static.dsp4
14 files changed, 23 insertions, 23 deletions
diff --git a/examples/lsusb.dsp b/examples/lsusb.dsp
index b598ffa..d7b223f 100644
--- a/examples/lsusb.dsp
+++ b/examples/lsusb.dsp
@@ -71,7 +71,7 @@ LINK32=link.exe
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo /n "../Win32/Debug/dll/core.sbr" "../Win32/Debug/dll/descriptor.sbr" "../Win32/Debug/dll/io.sbr" "../Win32/Debug/dll/sync.sbr" "../Win32/Debug/dll/windows_compat.sbr" "../Win32/Debug/dll/windows_usb.sbr"
+# ADD BSC32 /nologo /n "../Win32/Debug/dll/core.sbr" "../Win32/Debug/dll/descriptor.sbr" "../Win32/Debug/dll/io.sbr" "../Win32/Debug/dll/sync.sbr" "../Win32/Debug/dll/poll_windows.sbr" "../Win32/Debug/dll/windows_usb.sbr"
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "D:/Program Files/Microsoft SDK/Lib/setupapi.lib" /nologo /subsystem:console /debug /machine:I386
diff --git a/examples/xusb.dsp b/examples/xusb.dsp
index b47b8c0..981ac47 100644
--- a/examples/xusb.dsp
+++ b/examples/xusb.dsp
@@ -71,7 +71,7 @@ LINK32=link.exe
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo /n "../Win32/Debug/dll/core.sbr" "../Win32/Debug/dll/descriptor.sbr" "../Win32/Debug/dll/io.sbr" "../Win32/Debug/dll/sync.sbr" "../Win32/Debug/dll/windows_compat.sbr" "../Win32/Debug/dll/windows_usb.sbr"
+# ADD BSC32 /nologo /n "../Win32/Debug/dll/core.sbr" "../Win32/Debug/dll/descriptor.sbr" "../Win32/Debug/dll/io.sbr" "../Win32/Debug/dll/sync.sbr" "../Win32/Debug/dll/poll_windows.sbr" "../Win32/Debug/dll/windows_usb.sbr"
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "D:/Program Files/Microsoft SDK/Lib/setupapi.lib" /nologo /subsystem:console /debug /machine:I386
diff --git a/libusb-dll_2005.vcproj b/libusb-dll_2005.vcproj
index da05bd8..09271b3 100644
--- a/libusb-dll_2005.vcproj
+++ b/libusb-dll_2005.vcproj
@@ -403,7 +403,7 @@
</File>
<File
- RelativePath=".\libusb\os\windows_compat.c"
+ RelativePath=".\libusb\os\poll_windows.c"
>
</File>
<File
@@ -433,7 +433,7 @@
>
</File>
<File
- RelativePath=".\libusb\os\windows_compat.h"
+ RelativePath=".\libusb\os\poll_windows.h"
>
</File>
<File
diff --git a/libusb-dll_2008.vcproj b/libusb-dll_2008.vcproj
index b08d795..9fcbbad 100644
--- a/libusb-dll_2008.vcproj
+++ b/libusb-dll_2008.vcproj
@@ -338,7 +338,7 @@
>
</File>
<File
- RelativePath=".\libusb\os\windows_compat.c"
+ RelativePath=".\libusb\os\poll_windows.c"
>
</File>
<File
@@ -368,7 +368,7 @@
>
</File>
<File
- RelativePath=".\libusb\os\windows_compat.h"
+ RelativePath=".\libusb\os\poll_windows.h"
>
</File>
<File
diff --git a/libusb-static_2005.vcproj b/libusb-static_2005.vcproj
index afd646e..6b505ba 100644
--- a/libusb-static_2005.vcproj
+++ b/libusb-static_2005.vcproj
@@ -302,7 +302,7 @@
>
</File>
<File
- RelativePath=".\libusb\os\windows_compat.c"
+ RelativePath=".\libusb\os\poll_windows.c"
>
</File>
<File
@@ -332,7 +332,7 @@
>
</File>
<File
- RelativePath=".\libusb\os\windows_compat.h"
+ RelativePath=".\libusb\os\poll_windows.h"
>
</File>
<File
diff --git a/libusb-static_2008.vcproj b/libusb-static_2008.vcproj
index 70ecca8..dab2c31 100644
--- a/libusb-static_2008.vcproj
+++ b/libusb-static_2008.vcproj
@@ -300,7 +300,7 @@
>
</File>
<File
- RelativePath=".\libusb\os\windows_compat.c"
+ RelativePath=".\libusb\os\poll_windows.c"
>
</File>
<File
@@ -330,7 +330,7 @@
>
</File>
<File
- RelativePath=".\libusb\os\windows_compat.h"
+ RelativePath=".\libusb\os\poll_windows.h"
>
</File>
<File
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_)
diff --git a/libusb_dll.dsp b/libusb_dll.dsp
index 31dbeb7..9f00d99 100644
--- a/libusb_dll.dsp
+++ b/libusb_dll.dsp
@@ -131,7 +131,7 @@ SOURCE=.\libusb\os\threads_windows.c
# End Source File
# Begin Source File
-SOURCE=.\libusb\os\windows_compat.c
+SOURCE=.\libusb\os\poll_windows.c
# End Source File
# Begin Source File
@@ -175,7 +175,7 @@ SOURCE=.\libusb\os\threads_windows.h
# End Source File
# Begin Source File
-SOURCE=.\libusb\os\windows_compat.h
+SOURCE=.\libusb\os\poll_windows.h
# End Source File
# Begin Source File
diff --git a/libusb_static.dsp b/libusb_static.dsp
index eb12cd1..922c974 100644
--- a/libusb_static.dsp
+++ b/libusb_static.dsp
@@ -115,7 +115,7 @@ SOURCE=.\libusb\os\threads_windows.c
# End Source File
# Begin Source File
-SOURCE=.\libusb\os\windows_compat.c
+SOURCE=.\libusb\os\poll_windows.c
# End Source File
# Begin Source File
@@ -155,7 +155,7 @@ SOURCE=.\libusb\os\threads_windows.h
# End Source File
# Begin Source File
-SOURCE=.\libusb\os\windows_compat.h
+SOURCE=.\libusb\os\poll_windows.h
# End Source File
# Begin Source File
View Lorry Controller Status