summaryrefslogtreecommitdiff
path: root/libusb/os/windows_usb.c
diff options
context:
space:
mode:
authorPete Batard <pbatard@gmail.com>2010-01-28 23:18:52 +0000
committerPete Batard <pbatard@gmail.com>2010-01-28 23:18:52 +0000
commit47c83183c080c866c54bcf886e535ff7db907bb8 (patch)
treebdc1368e54dd601ec679f392e843a6700c4684f9 /libusb/os/windows_usb.c
parent37b685c3558513e32b30418c9fbc057d83a7ff53 (diff)
downloadlibusb-47c83183c080c866c54bcf886e535ff7db907bb8.tar.gz
r122: fixed poll conflict on cygwin (all compat functions renamed to _libusb_####)
- fixed sscanf_s undefined for non MS compilers - fixed cygiwn warnings in windows_usb.c
Diffstat (limited to 'libusb/os/windows_usb.c')
-rw-r--r--libusb/os/windows_usb.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/libusb/os/windows_usb.c b/libusb/os/windows_usb.c
index 42d88da..d33fbc9 100644
--- a/libusb/os/windows_usb.c
+++ b/libusb/os/windows_usb.c
@@ -160,6 +160,7 @@ static inline BOOLEAN guid_eq(const GUID *guid1, const GUID *guid2) {
return false;
}
+#if 0
static char* guid_to_string(const GUID guid)
{
static char guid_string[GUID_STRING_LENGTH];
@@ -170,6 +171,7 @@ static char guid_string[GUID_STRING_LENGTH];
guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]);
return guid_string;
}
+#endif
/*
* Converts a windows error to human readable string
@@ -3236,7 +3238,6 @@ static int hid_submit_bulk_transfer(struct usbi_transfer *itransfer) {
bool direction_in, ret;
int current_interface;
DWORD size;
- int r = LIBUSB_ERROR_INVALID_PARAM;
CHECK_HID_AVAILABLE;
@@ -3284,9 +3285,7 @@ static int hid_abort_transfers(struct usbi_transfer *itransfer)
{
struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
struct windows_transfer_priv *transfer_priv = usbi_transfer_get_os_priv(itransfer);
- struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev);
struct windows_device_handle_priv *handle_priv = (struct windows_device_handle_priv *)transfer->dev_handle->os_priv;
- struct windows_device_priv *priv = __device_priv(transfer->dev_handle->dev);
HANDLE hid_handle;
int current_interface;
@@ -3301,9 +3300,7 @@ static int hid_abort_transfers(struct usbi_transfer *itransfer)
static int hid_reset_device(struct libusb_device_handle *dev_handle)
{
- struct libusb_context *ctx = DEVICE_CTX(dev_handle->dev);
struct windows_device_handle_priv *handle_priv = (struct windows_device_handle_priv *)dev_handle->os_priv;
- struct windows_device_priv *priv = __device_priv(dev_handle->dev);
HANDLE hid_handle;
int current_interface;