X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fusb.c;h=93286e8ad8289419ceaebb8b7069a1dd476db864;hb=4c5ac0cf5b3e8a13d6f0ff4255fa21ed6874774a;hp=8073f869dbdacf3f5a9842d6ee516a23507e7773;hpb=6f63b1ee67ef9a8d9511aec9bac5f9d84c21356d;p=libsigrok.git diff --git a/src/usb.c b/src/usb.c index 8073f869..93286e8a 100644 --- a/src/usb.c +++ b/src/usb.c @@ -38,7 +38,6 @@ typedef int libusb_os_handle; #endif /** Custom GLib event source for libusb I/O. - * @internal */ struct usb_source { GSource base; @@ -184,7 +183,7 @@ static LIBUSB_CALL void usb_pollfd_added(libusb_os_handle fd, return; pollfd = g_slice_new(GPollFD); -#ifdef G_OS_WIN32 +#ifdef _WIN32 events = G_IO_IN; #endif pollfd->fd = (gintptr)fd; @@ -509,7 +508,7 @@ SR_PRIV int usb_get_port_path(libusb_device *dev, char *path, int path_len) } /** - * Check the USB configuration to determine if this device has a given + * Check the USB configuration to determine if this device has a given * manufacturer and product string. * * @return TRUE if the device's configuration profile strings